diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-06-24 08:50:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-06-24 08:52:38 -0700 |
| commit | d9443441ff5ceb940d62878d5e1c0dd1d1e8ac62 (patch) | |
| tree | 5c38a0f6cdfdd77f83e60b02aa9b9c06db80c164 /lib/cdefs.h | |
| parent | 7903cdbf6022f3f28a94d484926672e865311905 (diff) | |
| download | gnulib-d9443441ff5ceb940d62878d5e1c0dd1d1e8ac62.tar.gz | |
libc-config: merge from glibc
* lib/cdefs.h (__inline, __restrict):
Copy from current glibc. This fixes glibc bug 17721,
which Gnulib had already fixed in a different way.
(__nonnull): Lessen the distance from glibc by using the
glibc definition inside an ‘#ifndef __nonnull’.
(__attribute_nonstring__): New macro, copied from
current glibc.
* lib/libc-config.h (__attribute_nonstring__): New undef.
(__restrict): Remove; workaround no longer needed.
Keep the __inline workaround, though, as it uses HAVE___INLINE to
support more compilers than the glibc __inline can.
Diffstat (limited to 'lib/cdefs.h')
| -rw-r--r-- | lib/cdefs.h | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/lib/cdefs.h b/lib/cdefs.h index 76325c5de5..b164531248 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -72,7 +72,12 @@ #else /* Not GCC. */ -# define __inline /* No inline functions. */ +# if (defined __cplusplus \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) +# define __inline inline +# else +# define __inline /* No inline functions. */ +# endif # define __THROW # define __THROWNL @@ -282,10 +287,16 @@ # define __attribute_format_strfmon__(a,b) /* Ignore */ #endif -/* The nonnull function attribute allows to mark pointer parameters which - must not be NULL. - In Gnulib we use the macro _GL_ARG_NONNULL instead of __nonnull, because - __nonnull is defined in an incompatible way in FreeBSD's include files. */ +/* The nonnull function attribute marks pointer parameters that + must not be NULL. Do not define __nonnull if it is already defined, + for portability when this file is used in Gnulib. */ +#ifndef __nonnull +# if __GNUC_PREREQ (3,3) +# define __nonnull(params) __attribute__ ((__nonnull__ params)) +# else +# define __nonnull(params) +# endif +#endif /* If fortification mode, we warn about unused results of certain function calls which can lead to problems. */ @@ -365,7 +376,11 @@ /* __restrict is known in EGCS 1.2 and above. */ #if !__GNUC_PREREQ (2,92) -# define __restrict /* Ignore */ +# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +# define __restrict restrict +# else +# define __restrict /* Ignore */ +# endif #endif /* ISO C99 also allows to declare arrays as non-overlapping. The syntax is @@ -404,6 +419,15 @@ # endif #endif +#if __GNUC_PREREQ (8, 0) +/* Describes a char array whose address can safely be passed as the first + argument to strncpy and strncat, as the char array is not necessarily + a NUL-terminated string. */ +# define __attribute_nonstring__ __attribute__ ((__nonstring__)) +#else +# define __attribute_nonstring__ +#endif + #if (!defined _Static_assert && !defined __cplusplus \ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ && (!__GNUC_PREREQ (4, 6) || defined __STRICT_ANSI__)) |