From 35cea22b36cbb5906e0387516feb28c3d1ef3ec3 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 26 Sep 2009 16:28:24 -0600 Subject: [PATCH] argp: fix compilation of getopt * lib/getopt.in.h (includes): Use different guard than glibc. Reported by Sergey Poznyakoff. Signed-off-by: Eric Blake --- ChangeLog | 4 ++++ lib/getopt.in.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 385f04877..f1bcf697b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-09-26 Eric Blake + argp: fix compilation of getopt + * lib/getopt.in.h (includes): Use different guard than glibc. + Reported by Sergey Poznyakoff. + doc: mention more cygwin 1.7 status * doc/posix-functions/access.texi (access): Mention cygwin 1.5 bug. diff --git a/lib/getopt.in.h b/lib/getopt.in.h index e23259c51..15c213f79 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef _GETOPT_H +#ifndef _GL_GETOPT_H #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -27,10 +27,10 @@ # @INCLUDE_NEXT@ @NEXT_GETOPT_H@ #endif -#ifndef _GETOPT_H +#ifndef _GL_GETOPT_H #ifndef __need_getopt -# define _GETOPT_H 1 +# define _GL_GETOPT_H 1 #endif /* Standalone applications should #define __GETOPT_PREFIX to an -- 2.11.0