From 7aa9c2486c2d85a8de6204ab3734f457d450cdb6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 19 Sep 2009 02:09:48 +0200 Subject: remove a few more empty #if/#endif pairs Signed-off-by: Denys Vlasenko --- libc/misc/fnmatch/fnmatch.c | 7 +++---- libc/misc/time/time.c | 3 +-- libc/stdio/fseeko.c | 3 --- libc/stdio/vasprintf.c | 4 ---- libc/stdio/vdprintf.c | 6 ++---- libc/stdio/vsnprintf.c | 3 --- libc/stdlib/stdlib.c | 2 -- libc/string/_collate.c | 7 ++----- libc/string/strncasecmp.c | 2 -- libc/sysdeps/linux/common/setegid.c | 3 --- libc/sysdeps/linux/common/seteuid.c | 4 ---- 11 files changed, 8 insertions(+), 36 deletions(-) (limited to 'libc') diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index f069e5cea..d25619b34 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -340,10 +340,9 @@ is_char_class (const wchar_t *wcs) # include "fnmatch_loop.c" # endif -#ifdef __UCLIBC_HAS_WCHAR__ -#else -#undef MB_CUR_MAX -#define MB_CUR_MAX 1 +#ifndef __UCLIBC_HAS_WCHAR__ +# undef MB_CUR_MAX +# define MB_CUR_MAX 1 #endif int diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index 05971389f..583c17aad 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -1172,8 +1172,7 @@ LOOP: i = 16 + 6; /* 0-fill, width = 4 */ } -#ifdef __UCLIBC_HAS_TM_EXTENSIONS__ -#else +#ifndef __UCLIBC_HAS_TM_EXTENSIONS__ __UCLIBC_MUTEX_UNLOCK(_time_tzlock); if (*p == 'Z') { goto OUTPUT; diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c index 5f3bbbb98..3caf1ac79 100644 --- a/libc/stdio/fseeko.c +++ b/libc/stdio/fseeko.c @@ -16,9 +16,6 @@ # define OFFSET_TYPE long int #endif -#ifdef __UCLIBC_HAS_LFS__ -#endif - int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence) { #if defined(__UCLIBC_HAS_LFS__) && !defined(__DO_LARGEFILE) diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c index 175c497a5..a901ee815 100644 --- a/libc/stdio/vasprintf.c +++ b/libc/stdio/vasprintf.c @@ -22,10 +22,6 @@ #warning Skipping vasprintf since no vsnprintf! #else -#ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ -#else -#endif - int vasprintf(char **__restrict buf, const char * __restrict format, va_list arg) { diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c index 8e9926ff0..e3405e411 100644 --- a/libc/stdio/vdprintf.c +++ b/libc/stdio/vdprintf.c @@ -11,8 +11,6 @@ #include "_stdio.h" #include -#ifdef __USE_OLD_VFPRINTF__ -#endif int vdprintf(int filedes, const char * __restrict format, va_list arg) { @@ -42,10 +40,10 @@ int vdprintf(int filedes, const char * __restrict format, va_list arg) #ifdef __UCLIBC_HAS_WCHAR__ f.__ungot_width[0] = 0; -#endif /* __UCLIBC_HAS_WCHAR__ */ +#endif #ifdef __STDIO_MBSTATE __INIT_MBSTATE(&(f.__state)); -#endif /* __STDIO_MBSTATE */ +#endif /* _vfprintf_internal doesn't do any locking, locking init is here * only because of fflush_unlocked. TODO? */ diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c index 7eb91eeff..07cff3410 100644 --- a/libc/stdio/vsnprintf.c +++ b/libc/stdio/vsnprintf.c @@ -9,9 +9,6 @@ #include -#ifdef __USE_OLD_VFPRINTF__ -#endif - #ifdef __UCLIBC_MJN3_ONLY__ #warning WISHLIST: Implement vsnprintf for non-buffered and no custom stream case. #endif /* __UCLIBC_MJN3_ONLY__ */ diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index eb34dfc0b..ad0c4aac0 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -635,8 +635,6 @@ unsigned long long attribute_hidden _stdlib_strto_ll(register const Wchar * __re #else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */ -#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ -#endif /* This is the main work fuction which handles both strtoll (sflag = 1) and * strtoull (sflag = 0). */ diff --git a/libc/string/_collate.c b/libc/string/_collate.c index eadbd6c6e..77d9eb62c 100644 --- a/libc/string/_collate.c +++ b/libc/string/_collate.c @@ -19,9 +19,6 @@ #include #include -#ifdef WANT_WIDE -#endif - #ifdef __UCLIBC_HAS_LOCALE__ #if defined(L_strxfrm) || defined(L_strxfrm_l) || defined(L_wcsxfrm) || defined(L_wcsxfrm_l) @@ -512,9 +509,9 @@ int __XL_NPP(wcscoll) (const Wchar *s0, const Wchar *s1 __LOCALE_PARAM ) if (!CUR_COLLATE->num_weights) { /* C locale */ #ifdef WANT_WIDE return wcscmp(s0, s1); -#else /* WANT_WIDE */ +#else return strcmp(s0, s1); -#endif /* WANT_WIDE */ +#endif } pass = 0; diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c index b290e5a22..2af305e16 100644 --- a/libc/string/strncasecmp.c +++ b/libc/string/strncasecmp.c @@ -21,8 +21,6 @@ # ifdef __UCLIBC_DO_XLOCALE # define TOLOWER(C) tolower_l((C), locale_arg) # else -#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ -#endif # define TOLOWER(C) tolower((C)) # endif #endif diff --git a/libc/sysdeps/linux/common/setegid.c b/libc/sysdeps/linux/common/setegid.c index d1daf319b..30329bc5c 100644 --- a/libc/sysdeps/linux/common/setegid.c +++ b/libc/sysdeps/linux/common/setegid.c @@ -11,9 +11,6 @@ #include #include -#if (defined __NR_setresgid || defined __NR_setresgid32) && defined __USE_GNU -#endif - int setegid(gid_t gid) { int result; diff --git a/libc/sysdeps/linux/common/seteuid.c b/libc/sysdeps/linux/common/seteuid.c index 44f085406..3e1611d08 100644 --- a/libc/sysdeps/linux/common/seteuid.c +++ b/libc/sysdeps/linux/common/seteuid.c @@ -16,10 +16,6 @@ #undef __NR_setresuid32 #endif - -#if (defined __NR_setresuid || defined __NR_setresuid32) && defined __USE_GNU -#endif - int seteuid(uid_t uid) { int result; -- cgit v1.2.3