diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-17 17:25:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-17 17:25:32 +0000 |
| commit | 9bbd7837b698c0bba325de00cd396c1e970ab281 (patch) | |
| tree | 44023c4f36e4d1acf2d5107cd9ee2cd368f5d1ca /string/bits/string2.h | |
| parent | 431c33c0bc7cb43231da4364187e0161b0541071 (diff) | |
| download | glibc-9bbd7837b698c0bba325de00cd396c1e970ab281.tar glibc-9bbd7837b698c0bba325de00cd396c1e970ab281.tar.gz glibc-9bbd7837b698c0bba325de00cd396c1e970ab281.tar.bz2 glibc-9bbd7837b698c0bba325de00cd396c1e970ab281.zip | |
Update.
1999-05-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/i386/i486/Versions: New file with inline functions from
sysdeps/i386/i486/bits/string.h for now.
* sysdeps/i386/Versions: Add inline functions from
sysdeps/i386/bits/string.h.
* string/Versions: Add inline functions from <bits/string2.h>.
* string/Makefile (routines): Add string-inlines.
* string/string-inlines.c: New file, used for implementation of
extern inline functions.
* sysdeps/i386/i486/bits/string.h: Use _FORCE_INLINES to generate
non inlined versions of functions.
* string/bits/string2.h: Likewise.
* sysdeps/i386/bits/string.h: Likewise.
1999-05-17 Ulrich Drepper <drepper@cygnus.com>
* inet/arpa/tftp.h: Add second packed attribute.
Diffstat (limited to 'string/bits/string2.h')
| -rw-r--r-- | string/bits/string2.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h index 4d67c57a77..fdfa32dc2c 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -39,10 +39,12 @@ We must use here macros instead of inline functions since the trick won't work with the later. */ -#ifdef __cplusplus -# define __STRING_INLINE inline -#else -# define __STRING_INLINE extern __inline +#ifndef __STRING_INLINE +# ifdef __cplusplus +# define __STRING_INLINE inline +# else +# define __STRING_INLINE extern __inline +# endif #endif #if _STRING_ARCH_unaligned @@ -939,7 +941,7 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2, #endif -#ifdef __USE_GNU +#if defined __USE_GNU && !defined _FORCE_INLINES # ifndef _HAVE_STRING_ARCH_strnlen __STRING_INLINE size_t strnlen (__const char *__string, size_t __maxlen); __STRING_INLINE size_t @@ -1151,6 +1153,8 @@ __strsep_g (char **__s, __const char *__reject) #endif /* Use misc. or use GNU. */ -#undef __STRING_INLINE +#ifndef _FORCE_INLINES +# undef __STRING_INLINE +#endif #endif /* No string inlines. */ |