diff options
author | paul <paul> | 2005-05-15 14:25:08 +0000 |
---|---|---|
committer | paul <paul> | 2005-05-15 14:25:08 +0000 |
commit | 2ee410d443a1ffcebdc7cfbdbc13efa76fd4dfa4 (patch) | |
tree | b896aae45968426d8803bc2bbcfe2c4ac82a8005 /lib/getopt.h | |
parent | f9233238a3848f3183e4d3d7e00cd28cca0b360f (diff) | |
download | quagga-2ee410d443a1ffcebdc7cfbdbc13efa76fd4dfa4.tar.bz2 quagga-2ee410d443a1ffcebdc7cfbdbc13efa76fd4dfa4.tar.xz |
2005-05-15 Paul Jakma <paul@dishone.st>
* 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
Diffstat (limited to 'lib/getopt.h')
-rw-r--r-- | lib/getopt.h | 4 |
1 files changed, 2 insertions, 2 deletions
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, |