diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/bits/string2.h | 4 | ||||
| -rw-r--r-- | string/bits/string3.h | 4 | ||||
| -rw-r--r-- | string/endian.h | 4 | ||||
| -rw-r--r-- | string/string.h | 8 | ||||
| -rw-r--r-- | string/strings.h | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h index b3df708..fb83579 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1258,7 +1258,7 @@ __strsep_3c (char **__s, char __reject1, char __reject2, char __reject3) } return __retval; } -# ifdef __USE_BSD +# ifdef __USE_MISC # define strsep(s, reject) __strsep (s, reject) # endif #endif @@ -1287,7 +1287,7 @@ extern char *__strdup (const char *__string) __THROW __attribute_malloc__; __retval; })) \ : __strdup (s))) -# if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN_EXTENDED # define strdup(s) __strdup (s) # endif # endif diff --git a/string/bits/string3.h b/string/bits/string3.h index acd2577..7606090 100644 --- a/string/bits/string3.h +++ b/string/bits/string3.h @@ -37,7 +37,7 @@ __warndecl (__warn_memset_zero_len, # undef mempcpy # undef stpcpy # endif -# ifdef __USE_BSD +# ifdef __USE_MISC # undef bcopy # undef bzero # endif @@ -84,7 +84,7 @@ __NTH (memset (void *__dest, int __ch, size_t __len)) return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest)); } -#ifdef __USE_BSD +#ifdef __USE_MISC __fortify_function void __NTH (bcopy (const void *__src, void *__dest, size_t __len)) { diff --git a/string/endian.h b/string/endian.h index 875fea3..9368b5c 100644 --- a/string/endian.h +++ b/string/endian.h @@ -41,7 +41,7 @@ # define __FLOAT_WORD_ORDER __BYTE_ORDER #endif -#ifdef __USE_BSD +#ifdef __USE_MISC # define LITTLE_ENDIAN __LITTLE_ENDIAN # define BIG_ENDIAN __BIG_ENDIAN # define PDP_ENDIAN __PDP_ENDIAN @@ -55,7 +55,7 @@ #endif -#if defined __USE_BSD && !defined __ASSEMBLER__ +#if defined __USE_MISC && !defined __ASSEMBLER__ /* Conversion interfaces. */ # include <bits/byteswap.h> diff --git a/string/string.h b/string/string.h index b127e8d..9fabf2b 100644 --- a/string/string.h +++ b/string/string.h @@ -54,7 +54,7 @@ __END_NAMESPACE_STD /* Copy no more than N bytes of SRC to DEST, stopping when C is found. Return the position in DEST one byte past where C was copied, or NULL if C was not found in the first N bytes of SRC. */ -#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN +#if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN extern void *memccpy (void *__restrict __dest, const void *__restrict __src, int __c, size_t __n) __THROW __nonnull ((1, 2)); @@ -170,7 +170,7 @@ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, __locale_t __l) __THROW __nonnull ((2, 4)); #endif -#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED \ +#if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN_EXTENDED \ || defined __USE_XOPEN2K8 /* Duplicate S, returning an identical malloc'd string. */ extern char *strdup (const char *__s) @@ -450,7 +450,7 @@ extern char *strerror_l (int __errnum, __locale_t __l) __THROW; the namespace rules does not allow this. */ extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1)); -#ifdef __USE_BSD +#ifdef __USE_MISC /* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ extern void bcopy (const void *__src, void *__dest, size_t __n) __THROW __nonnull ((1, 2)); @@ -551,7 +551,7 @@ extern int strncasecmp_l (const char *__s1, const char *__s2, __THROW __attribute_pure__ __nonnull ((1, 2, 4)); #endif -#ifdef __USE_BSD +#ifdef __USE_MISC /* Return the next DELIM-delimited token from *STRINGP, terminating it with a '\0', and update *STRINGP to point past it. */ extern char *strsep (char **__restrict __stringp, diff --git a/string/strings.h b/string/strings.h index 994c4b0..872a0b2 100644 --- a/string/strings.h +++ b/string/strings.h @@ -19,9 +19,9 @@ #define _STRINGS_H 1 /* We don't need and should not read this file if <string.h> was already - read. The one exception being that if __USE_BSD isn't defined, then + read. The one exception being that if __USE_MISC isn't defined, then these aren't defined in string.h, so we need to define them here. */ -#if !defined _STRING_H || !defined __USE_BSD +#if !defined _STRING_H || !defined __USE_MISC # include <features.h> # define __need_size_t |