From 024a7f06979b467299a85e915b78af456a89e3a6 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 15 May 2005 14:25:08 +0000 Subject: 2005-05-15 Paul Jakma * getopt.h: It's not just __GNU_LIBRARY__ which defines getopt, eg __EXTENSIONS__ does too on SunOS. It still seems awfully fragile though. * getopt.c: include zebra.h after config.h, before including getopt.h so that things at least are consistent.. * getopt1.c: ditto --- lib/getopt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/getopt.h') diff --git a/lib/getopt.h b/lib/getopt.h index c4519b7f..68a9acfb 100644 --- a/lib/getopt.h +++ b/lib/getopt.h @@ -99,12 +99,12 @@ struct option #define optional_argument 2 #if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ +#if defined (__GNU_LIBRARY__) || defined (__EXTENSIONS__) /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ extern int getopt (int argc, char *const *argv, const char *shortopts); -#else /* not __GNU_LIBRARY__ */ +#else /* not __GNU_LIBRARY__ or __EXTENSIONS__ */ extern int getopt (void); #endif /* __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, -- cgit v1.2.1