diff options
| author | DJ Delorie <dj@redhat.com> | 2002-06-24 17:39:28 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-06-24 17:39:28 +0000 |
| commit | 931f285fb1aac3221b7cbf8c360fb06442772bba (patch) | |
| tree | 50f81f5486b2edcc3f4e1069d98822e630c2ed7e /include | |
| parent | 65044526557bc54ac5b326bed9ee936c6d2feeb0 (diff) | |
| download | gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.zip gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.tar.gz gdb-931f285fb1aac3221b7cbf8c360fb06442772bba.tar.bz2 | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/getopt.h | 11 | ||||
| -rw-r--r-- | include/libiberty.h | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 038ab46..05a3981 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2002-06-24 Alan Modra <amodra@bigpond.net.au> + + * libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME. + * getopt.h (getopt): Don't declare if HAVE_DECL_GETOPT. + 2002-06-18 Dave Brolley <brolley@redhat.com> From Catherine Moore: diff --git a/include/getopt.h b/include/getopt.h index cb5feba..0c6470b 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, diff --git a/include/libiberty.h b/include/libiberty.h index 3e0ca09..0463301 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -73,12 +73,12 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC; 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 (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || (defined (HAVE_DECL_BASENAME) && !HAVE_DECL_BASENAME) +#if !HAVE_DECL_BASENAME +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME) extern char *basename PARAMS ((const char *)); #else -# if !defined (HAVE_DECL_BASENAME) extern char *basename (); -# endif +#endif #endif /* A well-defined basename () that is always compiled in. */ |