diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-24 05:08:02 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-24 05:08:02 +0000 |
| commit | f6eab2448b8d749148e2e97dc5fef7111703cded (patch) | |
| tree | c78ad635ae4460c3603d07b2ee9bb5e277ca6011 /include/getopt.h | |
| parent | 52201c54f33cd5fb81930e51083cb0b64eefc67e (diff) | |
| download | gcc-f6eab2448b8d749148e2e97dc5fef7111703cded.tar.gz | |
* libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME.
* getopt.h (getopt): Don't declare if HAVE_DECL_GETOPT.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54941 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include/getopt.h')
| -rw-r--r-- | include/getopt.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/getopt.h b/include/getopt.h index cb5feba1160..0c6470b3ddb 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -105,16 +105,17 @@ struct option declaration without arguments. If it is 0, we checked and failed to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ -#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT) +#if !HAVE_DECL_GETOPT +#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) /* 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__ */ -# if !defined (HAVE_DECL_GETOPT) +#else extern int getopt (); -# endif -#endif /* __GNU_LIBRARY__ */ +#endif +#endif /* !HAVE_DECL_GETOPT */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); extern int getopt_long_only (int argc, char *const *argv, |