diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2000-05-23 17:42:19 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2000-05-23 17:42:19 +0000 |
| commit | f31e826ba314bc910beec6de5bf534f2462a00c7 (patch) | |
| tree | 2d8c701cdb99568d7922c37d21a7fda0f8ea9913 /include | |
| parent | 04de731462db7abf438903fa71b850ac046f1067 (diff) | |
| download | gcc-f31e826ba314bc910beec6de5bf534f2462a00c7.zip gcc-f31e826ba314bc910beec6de5bf534f2462a00c7.tar.gz gcc-f31e826ba314bc910beec6de5bf534f2462a00c7.tar.bz2 | |
getopt.h (getopt): Also check HAVE_DECL_* when prototyping.
include:
* getopt.h (getopt): Also check HAVE_DECL_* when prototyping.
* libiberty.h (basename): Likewise.
gcc:
* aclocal.m4 (gcc_AC_CHECK_DECL, gcc_AC_CHECK_DECLS): New macros
rewritten from the internals of gcc_AC_NEED_DECLARATION{S}.
* configure.in (gcc_AC_CHECK_DECLS): Call this instead of
gcc_AC_NEED_DECLARATIONS.
* dwarfout.c: Don't prototype time().
* gcc.c: Check HAVE_DECL_* instead of NEED_DECLARATION_*.
* system.h: Likewise.
* toplev.c: Likewise.
From-SVN: r34108
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 6 | ||||
| -rw-r--r-- | include/getopt.h | 9 | ||||
| -rw-r--r-- | include/libiberty.h | 9 |
3 files changed, 22 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 3658cc4..5a0ddf5 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2000-05-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * getopt.h (getopt): Also check HAVE_DECL_* when prototyping. + + * libiberty.h (basename): Likewise. + 2000-05-06 Zack Weinberg <zack@wolery.cumb.org> * ansidecl.h: #define __extension__ to nothing if diff --git a/include/getopt.h b/include/getopt.h index fb30719a..9620fc7 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -99,13 +99,20 @@ struct option #define optional_argument 2 #if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ +/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1. If it is + undefined, we haven't run the autoconf check so provide the + 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) /* 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) extern int getopt (); +# endif #endif /* __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); diff --git a/include/libiberty.h b/include/libiberty.h index 9a536a4..476e016 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -36,10 +36,17 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC; across different systems, sometimes as "char *" and sometimes as "const char *" */ -#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) +/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1. If it is + undefined, we haven't run the autoconf check so provide the + 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) extern char *basename PARAMS ((const char *)); #else +# if !defined (HAVE_DECL_BASENAME) extern char *basename (); +# endif #endif /* Concatenate an arbitrary number of strings, up to (char *) NULL. |