diff options
| -rw-r--r-- | libc/inet/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | libc/misc/fnmatch/fnmatch_old.c | 2 | ||||
| -rw-r--r-- | libc/misc/ftw/ftw.c | 6 | ||||
| -rw-r--r-- | libc/misc/regex/regex_old.c | 12 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/attr.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/pthread.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/specific.c | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c index 25a5b8022..1953e6f7a 100644 --- a/libc/inet/getaddrinfo.c +++ b/libc/inet/getaddrinfo.c @@ -716,9 +716,9 @@ gaih_inet(const char *name, const struct gaih_service *service, (*pai)->ai_protocol = st2->protocol; (*pai)->ai_addrlen = socklen; (*pai)->ai_addr = (void *) (*pai) + sizeof(struct addrinfo); -#if SALEN +#if defined SALEN (*pai)->ai_addr->sa_len = socklen; -#endif /* SALEN */ +#endif (*pai)->ai_addr->sa_family = family; #if defined __UCLIBC_HAS_IPV6__ diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c index 839c77579..69a8ede50 100644 --- a/libc/misc/fnmatch/fnmatch_old.c +++ b/libc/misc/fnmatch/fnmatch_old.c @@ -15,7 +15,7 @@ License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include <config.h> #endif diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c index afc55f88a..9325ab745 100644 --- a/libc/misc/ftw/ftw.c +++ b/libc/misc/ftw/ftw.c @@ -105,11 +105,11 @@ char *alloca (); /* libc_hidden_proto(lstat) */ /* libc_hidden_proto(stat) */ -#if ! _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy +#if !defined _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy char *stpcpy (); #endif -#if ! _LIBC && ! defined HAVE_MEMPCPY && ! defined mempcpy +#if !defined _LIBC && ! defined HAVE_MEMPCPY && ! defined mempcpy /* Be CAREFUL that there are no side effects in N. */ # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) #endif @@ -162,7 +162,7 @@ extern char *xgetcwd (void); /* Arrange to make lstat calls go through the wrapper function on systems with an lstat function that does not dereference symlinks that are specified with a trailing slash. */ -#if ! _LIBC && ! LSTAT_FOLLOWS_SLASHED_SYMLINK && !defined __UCLIBC__ +#if !defined _LIBC && !defined LSTAT_FOLLOWS_SLASHED_SYMLINK && !defined __UCLIBC__ int rpl_lstat (const char *, struct stat *); # undef lstat # define lstat(Name, Stat_buf) rpl_lstat(Name, Stat_buf) diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index c7f187dc2..65aec97f1 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -120,7 +120,7 @@ # endif /* This is for other GNU distributions with internationalized messages. */ -# if HAVE_LIBINTL_H || defined _LIBC +# if defined HAVE_LIBINTL_H || defined _LIBC # include <libintl.h> # ifdef _LIBC # undef gettext @@ -208,7 +208,7 @@ char *realloc (); # endif /* not emacs */ -# if defined _LIBC || HAVE_LIMITS_H +# if defined _LIBC || defined HAVE_LIMITS_H # include <limits.h> # endif @@ -2230,7 +2230,7 @@ typedef struct } # ifndef DEFINED_ONCE -# if defined _LIBC || WIDE_CHAR_SUPPORT +# if defined _LIBC || defined WIDE_CHAR_SUPPORT /* The GNU C library provides support for user-defined character classes and the functions from ISO C amendement 1. */ # ifdef CHARCLASS_NAME_MAX @@ -3286,7 +3286,7 @@ PREFIX(regex_compile) ( the leading `:' and `[' (but set bits for them). */ if (c == ':' && *p == ']') { -# if defined _LIBC || WIDE_CHAR_SUPPORT +# if defined _LIBC || defined WIDE_CHAR_SUPPORT boolean is_lower = STREQ (str, "lower"); boolean is_upper = STREQ (str, "upper"); wctype_t wt; @@ -4542,7 +4542,7 @@ byte_compile_range ( unsigned this_char; const char *p = *p_ptr; reg_errcode_t ret; -# if _LIBC +# ifdef _LIBC const unsigned char *collseq; unsigned int start_colseq; unsigned int end_colseq; @@ -4560,7 +4560,7 @@ byte_compile_range ( /* Report an error if the range is empty and the syntax prohibits this. */ ret = syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR; -# if _LIBC +# ifdef _LIBC collseq = (const unsigned char *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB); diff --git a/libpthread/linuxthreads.old/attr.c b/libpthread/linuxthreads.old/attr.c index 30294afe4..a0aacf12a 100644 --- a/libpthread/linuxthreads.old/attr.c +++ b/libpthread/linuxthreads.old/attr.c @@ -61,7 +61,7 @@ int pthread_attr_init(pthread_attr_t *attr) libpthread_hidden_def(pthread_attr_init) /* uClibc: leave out this for now. */ -#if DO_PTHREAD_VERSIONING_WITH_UCLIBC +#if defined DO_PTHREAD_VERSIONING_WITH_UCLIBC #if defined __PIC__ && defined DO_VERSIONING default_symbol_version (__pthread_attr_init_2_1, pthread_attr_init, GLIBC_2.1); diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c index 119c1cdda..308845d36 100644 --- a/libpthread/linuxthreads.old/pthread.c +++ b/libpthread/linuxthreads.old/pthread.c @@ -321,7 +321,7 @@ libpthread_hidden_proto(pthread_condattr_init) struct pthread_functions __pthread_functions = { -#if !(USE_TLS && HAVE___THREAD) +#if !(defined USE_TLS && HAVE___THREAD) .ptr_pthread_internal_tsd_set = __pthread_internal_tsd_set, .ptr_pthread_internal_tsd_get = __pthread_internal_tsd_get, .ptr_pthread_internal_tsd_address = __pthread_internal_tsd_address, diff --git a/libpthread/linuxthreads.old/specific.c b/libpthread/linuxthreads.old/specific.c index dd86148d8..67e8eda4e 100644 --- a/libpthread/linuxthreads.old/specific.c +++ b/libpthread/linuxthreads.old/specific.c @@ -167,7 +167,7 @@ void __pthread_destroy_specifics(void) __pthread_unlock(THREAD_GETMEM(self, p_lock)); } -#if !(USE_TLS && HAVE___THREAD) +#if !(defined USE_TLS && HAVE___THREAD) /* Thread-specific data for libc. */ |