Mercurial > hg > octave-nkf > gnulib-hg
changeset 9338:ac948d4118d2
Handle 'inline' change in gcc 4.3.0.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 13 Oct 2007 15:25:42 +0200 |
parents | 8df9b5f6609e |
children | 06538f749e42 |
files | ChangeLog lib/argp-fmtstream.h lib/argp.h |
diffstat | 3 files changed, 63 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2007-10-13 Bruno Haible <bruno@clisp.org> + + Handle 'inline' change in gcc 4.3.0. + * lib/argp-fmtstream.h (argp_fmtstream_putc, argp_fmtstream_puts, + argp_fmtstream_write, argp_fmtstream_set_lmargin, + argp_fmtstream_set_rmargin, argp_fmtstream_set_wmargin, + argp_fmtstream_point): Disable 'extern' declaration if the function + definition is going to be provided inline. + (ARGP_FS_EI): If __GNUC_STDC_INLINE__ is defined, use the GNU C inline + semantics, not the ISO C99 inline semantics. + * lib/argp.h (argp_usage, _option_is_short, _option_is_end): Disable + 'extern' declaration if the function definition is going to be provided + inline. + (ARGP_EI): Don't assume GNU C. If __GNUC_STDC_INLINE__ is defined, use + the GNU C inline semantics, not the ISO C99 inline semantics. With + GCC 4.2, avoid a warning. + 2007-10-13 Bruno Haible <bruno@clisp.org> * lib/freading.h (freading): Enable the use of __freading for
--- a/lib/argp-fmtstream.h +++ b/lib/argp-fmtstream.h @@ -1,5 +1,5 @@ /* Word-wrapping and line-truncating streams. - Copyright (C) 1997, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 2006-2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -134,6 +134,7 @@ const char *__fmt, ...) __attribute__ ((__format__ (printf, 2, 3))); +#if _LIBC || !defined __OPTIMIZE__ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); @@ -144,6 +145,7 @@ const char *__str, size_t __len); extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, const char *__str, size_t __len); +#endif /* Access macros for various bits of state. */ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) @@ -153,6 +155,7 @@ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin #define __argp_fmtstream_wmargin argp_fmtstream_wmargin +#if _LIBC || !defined __OPTIMIZE__ /* Set __FS's left margin to LMARGIN and return the old value. */ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, size_t __lmargin); @@ -174,6 +177,7 @@ /* Return the column number of the current output point in __FS. */ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); +#endif /* Internal routines. */ extern void _argp_fmtstream_update (argp_fmtstream_t __fs); @@ -197,11 +201,24 @@ #endif #ifndef ARGP_FS_EI -# if __GNUC_GNU_INLINE__ -# define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) -# elif __GNUC__ -# define ARGP_FS_EI extern inline +# ifdef __GNUC__ + /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */ +# if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +# define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) +# else +# define ARGP_FS_EI extern inline +# endif # else + /* With other compilers, assume the ISO C99 meaning of 'inline', if + the compiler supports 'inline' at all. */ # define ARGP_FS_EI inline # endif #endif
--- a/lib/argp.h +++ b/lib/argp.h @@ -520,9 +520,11 @@ FILE *__restrict __stream, unsigned int __flags); +#if _LIBC || !defined __USE_EXTERN_INLINES /* Possibly output the standard usage message for ARGP to stderr and exit. */ extern void argp_usage (const struct argp_state *__state); extern void __argp_usage (const struct argp_state *__state); +#endif /* If appropriate, print the printf string FMT and following args, preceded by the program name and `:', to stderr, and followed by a `Try ... --help' @@ -551,6 +553,7 @@ const char *__restrict __fmt, ...) __attribute__ ((__format__ (__printf__, 4, 5))); +#if _LIBC || !defined __USE_EXTERN_INLINES /* Returns true if the option OPT is a valid short option. */ extern int _option_is_short (const struct argp_option *__opt) __THROW; extern int __option_is_short (const struct argp_option *__opt) __THROW; @@ -559,6 +562,7 @@ options array. */ extern int _option_is_end (const struct argp_option *__opt) __THROW; extern int __option_is_end (const struct argp_option *__opt) __THROW; +#endif /* Return the input field for ARGP in the parser corresponding to STATE; used by the help routines. */ @@ -579,7 +583,26 @@ # endif # ifndef ARGP_EI -# define ARGP_EI extern __inline__ +# ifdef __GNUC__ + /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */ +# if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +# define ARGP_EI extern __inline__ __attribute__ ((__gnu_inline__)) +# else +# define ARGP_EI extern __inline__ +# endif +# else + /* With other compilers, assume the ISO C99 meaning of 'inline', if + the compiler supports 'inline' at all. */ +# define ARGP_EI inline +# endif # endif ARGP_EI void