diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-25 09:11:53 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-25 09:11:53 +0000 |
| commit | 4a582094c28099144dac9528174ce7c0be72c0fd (patch) | |
| tree | 647f7c06d86df0e42887c2db744578bf71a991fc /string/bits | |
| parent | 88455219c104124f82cc11d038b17cb249c4b6bd (diff) | |
| download | glibc-4a582094c28099144dac9528174ce7c0be72c0fd.tar.gz glibc-4a582094c28099144dac9528174ce7c0be72c0fd.tar.xz glibc-4a582094c28099144dac9528174ce7c0be72c0fd.zip | |
Update.
1998-10-25 Ulrich Drepper <drepper@cygnus.com> * include/features.h: Define __USE_POSIS199506 is _POSIX_C_SOURCE is greater or equal than 199506L. * sysdeps/generic/bits/types.h (__fd_set): Define element as fds_bits only is __USE_XOPEN. Otherwise use __fds_bits. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. 1998-10-24 H.J. Lu <hjl@gnu.org> * locale/programs/charmap.c (parse_charmap): Accept tok_string for <code_set_name>. 1998-10-25 H.J. Lu <hjl@gnu.org> * locale/programs/ld-ctype.c (ctype_finish): Also check <space>. 1998-10-25 Ulrich Drepper <drepper@cygnus.com> * signal/signal.h: Include bits/sigthread.h only if __USE_POSIX199506. * sysdeps/unix/sysv/linux/bits/types.h: Include pthreadtypes.h only if __USE_POSIX199506 or __USE_UNIX98. 1998-10-24 22:34 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * string/bits/string2.h: Inline strdup+friends only if __USE_MISC || __USE_GNU (prevents namespace pollution). 1998-10-24 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN): Protect with __USE_BSD. * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN): Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN): Likewise. * sysdeps/unix/sysv/linux/bits/fcntl.h (LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN): Likewise. 1998-10-24 H.J. Lu <hjl@gnu.org> * libio/ioseekoff.c (_IO_seekoff): Check the valid dir value. * libio/rewind.c (rewind): Clear the error. 1998-10-24 H.J. Lu <hjl@gnu.org> * grp/grp.h (getgrent_r, getgrgid_r, getgrnam_r): Add "__" to "buffer". 1998-10-24 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/alpha/bits/time.h (timeval): Protect with __need_timeval. * sysdeps/unix/sysv/linux/mips/bits/time.h (timeval): Likewise. * sysdeps/unix/sysv/linux/bits/time.h (timeval): Likewise. 1998-10-24 H.J. Lu <hjl@gnu.org> * signal/signal.h (timespec, siginfo_t, sigwaitinfo, sigtimedwait, sigqueue): Protect with __USE_POSIX199309. 1998-10-24 H.J. Lu <hjl@gnu.org> * time/time.h (timespec): Protect with __USE_POSIX199309 instead of __USE_POSIX. 1998-10-24 H.J. Lu <hjl@gnu.org> * libio/fileops.c (_IO_new_file_seekoff): Always resync with the kernel file offset. * libio/oldfileops.c (_IO_old_file_seekoff): Likewise.
Diffstat (limited to 'string/bits')
| -rw-r--r-- | string/bits/string2.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h index fd431b8ece..cfbcc18aa0 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1011,18 +1011,18 @@ __strsep_g (char **__s, __const char *__reject) #endif /* We need the memory allocation functions for inline strdup(). - Referring to stdlib.h (even minimally) is not allowed if - __STRICT_ANSI__. */ -#ifndef __STRICT_ANSI__ + Referring to stdlib.h (even minimally) is not allowed + in any of the tight standards compliant modes. */ +#if defined __USE_MISC || defined __USE_GNU -#if !defined _HAVE_STRING_ARCH_strdup || !defined _HAVE_STRING_ARCH_strndup -# define __need_malloc_and_calloc -# include <stdlib.h> -#endif +# if !defined _HAVE_STRING_ARCH_strdup || !defined _HAVE_STRING_ARCH_strndup +# define __need_malloc_and_calloc +# include <stdlib.h> +# endif -#ifndef _HAVE_STRING_ARCH_strdup +# ifndef _HAVE_STRING_ARCH_strdup -# define __strdup(s) \ +# define __strdup(s) \ (__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s) \ ? (((__const char *) (s))[0] == '\0' \ ? (char *) calloc (1, 1) \ @@ -1033,14 +1033,14 @@ __strsep_g (char **__s, __const char *__reject) __retval; })) \ : __strdup (s))) -# if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED -# define strdup(s) __strdup (s) +# if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# define strdup(s) __strdup (s) +# endif # endif -#endif -#ifndef _HAVE_STRING_ARCH_strndup +# ifndef _HAVE_STRING_ARCH_strndup -# define __strndup(s, n) \ +# define __strndup(s, n) \ (__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s) \ ? (((__const char *) (s))[0] == '\0' \ ? (char *) calloc (1, 1) \ @@ -1059,12 +1059,12 @@ __strsep_g (char **__s, __const char *__reject) __retval; })) \ : __strndup ((s), (n)))) -# ifdef __GNU_SOURCE -# define strndup(s, n) __strndup ((s), (n)) +# ifdef __GNU_SOURCE +# define strndup(s, n) __strndup ((s), (n)) +# endif # endif -#endif -#endif /* Strict ANSI */ +#endif /* Use misc. or use GNU. */ #undef __STRING_INLINE |