From 7c07891caf91823c65d0ed7f700a1cfe983e15cc Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Wed, 22 Mar 2006 20:41:37 +0000
Subject: Merge conflicts.

---
 crypto/openssh/includes.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'crypto/openssh/includes.h')

diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index f4ab0a3..19aa1c4 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $	*/
+/*	$OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -22,6 +22,8 @@ __RCSID(msg)
 
 #include "config.h"
 
+#define _GNU_SOURCE /* activate extra prototypes for glibc */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -68,7 +70,6 @@ __RCSID(msg)
 #ifdef HAVE_NEXT
 #  include <libc.h>
 #endif
-#define __USE_GNU /* before unistd.h, activate extra prototypes for glibc */
 #include <unistd.h> /* For STDIN_FILENO, etc */
 #include <termios.h> /* Struct winsize */
 
-- 
cgit v1.1