[git commit master 1/1] syntax fixes

Peter S. Mazinger ps.m at gmx.net
Thu Mar 3 17:22:53 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=de71e42c04a7d35cf663b1c84ac1de5b6b93b052
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Avoid compile warnings about the use of undefined constants

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 include/ftw.h                   |    4 ++--
 libc/misc/ftw/ftw.c             |    4 ++--
 libpthread/nptl/allocatestack.c |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/ftw.h b/include/ftw.h
index 84f3e14..c79924d 100644
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -129,7 +129,7 @@ typedef int (*__nftw64_func_t) (__const char *__filename,
 # endif
 #endif
 
-#if __UCLIBC_HAS_FTW__
+#ifdef __UCLIBC_HAS_FTW__
 /* Call a function on every element in a directory tree.
 
    This function is a possible cancellation point and therefore not
@@ -151,7 +151,7 @@ extern int ftw64 (__const char *__dir, __ftw64_func_t __func,
 # endif
 #endif
 
-#if __UCLIBC_HAS_NFTW__ && defined __USE_XOPEN_EXTENDED
+#if defined __UCLIBC_HAS_NFTW__ && defined __USE_XOPEN_EXTENDED
 /* Call a function on every element in a directory tree.  FLAG allows
    to specify the behaviour more detailed.
 
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 4a62e38..9031e35 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -752,7 +752,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
 
 
 /* Entry points.  */
-#if __UCLIBC_HAS_FTW__
+#ifdef __UCLIBC_HAS_FTW__
 int
 FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)
 {
@@ -760,7 +760,7 @@ FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)
 }
 #endif
 
-#if __UCLIBC_HAS_NFTW__
+#ifdef __UCLIBC_HAS_NFTW__
 #ifndef _LIBC
 int
 NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
diff --git a/libpthread/nptl/allocatestack.c b/libpthread/nptl/allocatestack.c
index 6a4e252..e30fe41 100644
--- a/libpthread/nptl/allocatestack.c
+++ b/libpthread/nptl/allocatestack.c
@@ -122,7 +122,7 @@ static uintptr_t in_flight_stack;
 list_t __stack_user __attribute__ ((nocommon));
 hidden_data_def (__stack_user)
 
-#if COLORING_INCREMENT != 0
+#if defined COLORING_INCREMENT && COLORING_INCREMENT != 0
 /* Number of threads created.  */
 static unsigned int nptl_ncreated;
 #endif
@@ -443,7 +443,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
       void *mem = 0;
       const int prot = (PROT_READ | PROT_WRITE);
 
-#if COLORING_INCREMENT != 0
+#if defined COLORING_INCREMENT && COLORING_INCREMENT != 0
       /* Add one more page for stack coloring.  Don't do it for stacks
 	 with 16 times pagesize or larger.  This might just cause
 	 unnecessary misalignment.  */
@@ -474,7 +474,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 	     adjust the allocated stack size if necessary.  This way
 	     allocations directly following each other will not have
 	     aliasing problems.  */
-#if MULTI_PAGE_ALIASING != 0
+#if defined MULTI_PAGE_ALIASING && MULTI_PAGE_ALIASING != 0
 	  if ((size % MULTI_PAGE_ALIASING) == 0)
 	    size += pagesize_m1 + 1;
 #endif
@@ -494,7 +494,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 	     So we can never get a null pointer back from mmap.  */
 	  assert (mem != NULL);
 
-#if COLORING_INCREMENT != 0
+#if defined COLORING_INCREMENT && COLORING_INCREMENT != 0
 	  /* Atomically increment NCREATED.  */
 	  unsigned int ncreated = atomic_increment_val (&nptl_ncreated);
 
-- 
1.7.3.4



More information about the uClibc-cvs mailing list