From ac0c8a533d7b79f8404f904a05655e48aa792a45 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 28 Nov 2005 22:28:59 +1100
Subject: [PATCH]  - (dtucker) [includes.h] Bug #1122: __USE_GNU is a glibc
 internal macro, use    _GNU_SOURCE instead.  Patch from t8m at centrum.cz.

---
 ChangeLog  | 4 +++-
 includes.h | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 211e34634..c8c053f6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20051128
  - (dtucker) [regress/yes-head.sh] Work around breakage caused by some
    versions of GNU head.  Based on patch from zappaman at buraphalinux.org
+ - (dtucker) [includes.h] Bug #1122: __USE_GNU is a glibc internal macro, use
+   _GNU_SOURCE instead.  Patch from t8m at centrum.cz.
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2005/11/28 05:16:53
      [ssh-keygen.1 ssh-keygen.c]
@@ -3373,4 +3375,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4011 2005/11/28 06:05:40 dtucker Exp $
+$Id: ChangeLog,v 1.4012 2005/11/28 11:28:59 dtucker Exp $
diff --git a/includes.h b/includes.h
index 351dd2ac0..12d948b6f 100644
--- a/includes.h
+++ b/includes.h
@@ -21,6 +21,8 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 
 #include "config.h"
 
+#define _GNU_SOURCE /* activate extra prototypes for glibc */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -67,7 +69,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" 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 */