diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/assert.h | 2 | ||||
| -rw-r--r-- | include/ctype.h | 4 | ||||
| -rw-r--r-- | include/errno.h | 6 | ||||
| -rw-r--r-- | include/libc-symbols.h | 2 | ||||
| -rw-r--r-- | include/math.h | 2 | ||||
| -rw-r--r-- | include/netdb.h | 6 | ||||
| -rw-r--r-- | include/resolv.h | 2 | ||||
| -rw-r--r-- | include/stdio.h | 2 | ||||
| -rw-r--r-- | include/stdlib.h | 2 | ||||
| -rw-r--r-- | include/string.h | 4 | ||||
| -rw-r--r-- | include/sys/stat.h | 2 | ||||
| -rw-r--r-- | include/wctype.h | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/include/assert.h b/include/assert.h index abe182fced..c452667956 100644 --- a/include/assert.h +++ b/include/assert.h @@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion, const char *function) __THROW __attribute__ ((__noreturn__)); -# if !defined NOT_IN_libc || IS_IN (rtld) +# if IS_IN (libc) || IS_IN (rtld) hidden_proto (__assert_fail) hidden_proto (__assert_perror_fail) # endif diff --git a/include/ctype.h b/include/ctype.h index 2ef2bd24e8..f3157b9e7d 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -11,7 +11,7 @@ libc_hidden_proto (__ctype_init) So defeat macro expansion with parens for this declaration. */ extern int (__isctype) (int __c, int __mask); -# ifndef NOT_IN_libc +# if IS_IN (libc) /* These accessors are used by the optimized macros to find the thread-local cache of ctype information from the current thread's @@ -61,7 +61,7 @@ __ctype_tolower_loc (void) # define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; }) # endif /* Not __NO_CTYPE. */ -# endif /* Not NOT_IN_libc. */ +# endif /* IS_IN (libc). */ #endif /* Not _ISOMAC. */ #endif /* ctype.h */ diff --git a/include/errno.h b/include/errno.h index d650a1545f..7df41dfc31 100644 --- a/include/errno.h +++ b/include/errno.h @@ -22,19 +22,19 @@ # define errno rtld_errno extern int rtld_errno attribute_hidden; -# elif !defined NOT_IN_libc || IS_IN_LIB +# elif IS_IN_LIB # include <tls.h> # undef errno -# ifndef NOT_IN_libc +# if IS_IN (libc) # define errno __libc_errno # else # define errno errno /* For #ifndef errno tests. */ # endif extern __thread int errno attribute_tls_model_ie; -# endif /* !NOT_IN_libc || IS_IN_LIB */ +# endif /* IS_IN_LIB */ # define __set_errno(val) (errno = (val)) diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 52350d3b60..6d9b95d036 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -549,7 +549,7 @@ for linking") # define hidden_nolink(name, lib, version) #endif -#if !defined NOT_IN_libc +#if IS_IN (libc) # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) diff --git a/include/math.h b/include/math.h index b10bfa0474..42bb55eb98 100644 --- a/include/math.h +++ b/include/math.h @@ -6,7 +6,7 @@ /* Now define the internal interfaces. */ extern int __matherr (struct exception *__exc); -# if !defined NOT_IN_libc || IS_IN (libm) +# if IS_IN (libc) || IS_IN (libm) hidden_proto (__finite) hidden_proto (__isinf) hidden_proto (__isnan) diff --git a/include/netdb.h b/include/netdb.h index eccdbe6462..9e64a15ff7 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -4,15 +4,15 @@ #ifndef _ISOMAC /* Macros for accessing h_errno from inside libc. */ -# if !defined NOT_IN_libc || IS_IN_LIB +# if IS_IN_LIB # undef h_errno -# ifndef NOT_IN_libc +# if IS_IN (libc) # define h_errno __libc_h_errno # else # define h_errno h_errno /* For #ifndef h_errno tests. */ # endif extern __thread int h_errno attribute_tls_model_ie; -# endif /* !NOT_IN_libc || IS_IN_LIB */ +# endif /* IS_IN_LIB */ # define __set_h_errno(x) (h_errno = (x)) libc_hidden_proto (hstrerror) diff --git a/include/resolv.h b/include/resolv.h index 3904cb77c7..4c614760a8 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -13,7 +13,7 @@ #ifdef _RESOLV_H_ -# ifndef NOT_IN_libc +# if IS_IN (libc) # define __resp __libc_resp # endif extern __thread struct __res_state *__resp attribute_tls_model_ie; diff --git a/include/stdio.h b/include/stdio.h index 1c54fc48d8..0010607949 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -117,7 +117,7 @@ extern const char *const _sys_errlist_internal[] attribute_hidden; extern int _sys_nerr_internal attribute_hidden; libc_hidden_proto (__asprintf) -# if !defined NOT_IN_libc +# if IS_IN (libc) extern _IO_FILE *_IO_new_fopen (const char*, const char*); # define fopen(fname, mode) _IO_new_fopen (fname, mode) extern _IO_FILE *_IO_new_fdopen (int, const char*); diff --git a/include/stdlib.h b/include/stdlib.h index b8efbd7b3a..992b87793c 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -226,7 +226,7 @@ extern int __qfcvt_r (long double __value, int __ndigit, int *__restrict __decpt, int *__restrict __sign, char *__restrict __buf, size_t __len); -# ifndef NOT_IN_libc +# if IS_IN (libc) # undef MB_CUR_MAX # define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)) # endif diff --git a/include/string.h b/include/string.h index 172940b759..034e2953df 100644 --- a/include/string.h +++ b/include/string.h @@ -57,7 +57,7 @@ extern __typeof (strcasecmp_l) __strcasecmp_l; extern __typeof (strncasecmp_l) __strncasecmp_l; /* Alternative version which doesn't pollute glibc's namespace. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # undef strndupa # define strndupa(s, n) \ (__extension__ \ @@ -115,7 +115,7 @@ libc_hidden_builtin_proto (strspn) libc_hidden_builtin_proto (strstr) libc_hidden_builtin_proto (ffs) -#if (defined NOT_IN_libc || !defined SHARED) \ +#if (!IS_IN (libc) || !defined SHARED) \ && !defined NO_MEMPCPY_STPCPY_REDIRECT /* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call __mempcpy and __stpcpy if not inlined. */ diff --git a/include/sys/stat.h b/include/sys/stat.h index a44fbec465..873562a99d 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask); extern int __mkdir (const char *__path, __mode_t __mode); extern int __mknod (const char *__path, __mode_t __mode, __dev_t __dev); -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) hidden_proto (__fxstat) hidden_proto (__fxstat64) hidden_proto (__lxstat) diff --git a/include/wctype.h b/include/wctype.h index 676c04358b..b29e82484b 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -80,7 +80,7 @@ libc_hidden_proto (__towupper_l) /* The spec says that isdigit must only match the decimal digits. We can check this without a memory access. */ -# ifndef NOT_IN_libc +# if IS_IN (libc) # undef iswdigit # define iswdigit(c) ({ wint_t __c = (c); __c >= L'0' && __c <= L'9'; }) # undef iswdigit_l |