svn commit: branches/uClibc-nptl: include libc/stdlib/malloc-standard libc etc...

kraj at uclibc.org kraj at uclibc.org
Fri Jul 11 22:22:25 UTC 2008


Author: kraj
Date: 2008-07-11 15:22:24 -0700 (Fri, 11 Jul 2008)
New Revision: 22805

Log:
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Hush compiler for extern inline warnings by using __extern_inline macro, this also makes gcc 4.3 happy.

warning: C99 inline functions are not supported; using GNU89  
warning: to disable this warning use -fgnu89-inline or the gnu

Also fix this other warning.

warning: missing braces around initializer                    
warning: (near initialization for '_stdio_streams[0].__lock.__


Modified:
   branches/uClibc-nptl/include/ctype.h
   branches/uClibc-nptl/libc/stdlib/malloc-standard/malloc.h
   branches/uClibc-nptl/libc/sysdeps/linux/common/bits/cmathcalls.h
   branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_mutex.h
   branches/uClibc-nptl/libc/sysdeps/linux/m68k/bits/mathinline.h
   branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
   branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h


Changeset:
Modified: branches/uClibc-nptl/include/ctype.h
===================================================================
--- branches/uClibc-nptl/include/ctype.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/include/ctype.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -239,13 +239,13 @@
 # endif
 
 # ifdef __USE_EXTERN_INLINES
-extern __inline int
+__extern_inline int
 __NTH (tolower (int __c))
 {
   return __UCLIBC_CTYPE_IN_TO_DOMAIN(__c) ? (__UCLIBC_CTYPE_TOLOWER)[__c] : __c;
 }
 
-extern __inline int
+__extern_inline int
 __NTH (toupper (int __c))
 {
   return __UCLIBC_CTYPE_IN_TO_DOMAIN(__c) ? (__UCLIBC_CTYPE_TOUPPER)[__c] : __c;

Modified: branches/uClibc-nptl/libc/stdlib/malloc-standard/malloc.h
===================================================================
--- branches/uClibc-nptl/libc/stdlib/malloc-standard/malloc.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libc/stdlib/malloc-standard/malloc.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <bits/uClibc_mutex.h>
+#include <bits/libc-lock.h>
 
 libc_hidden_proto(mmap)
 libc_hidden_proto(sysconf)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/bits/cmathcalls.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/bits/cmathcalls.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/bits/cmathcalls.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -135,21 +135,21 @@
 #if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__
 
 /* Imaginary part of Z.  */
-extern __inline _Mdouble_
+__extern_inline _Mdouble_
 __MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW
 {
   return __imag__ __z;
 }
 
 /* Real part of Z.  */
-extern __inline _Mdouble_
+__extern_inline _Mdouble_
 __MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW
 {
   return __real__ __z;
 }
 
 /* Complex conjugate of Z.  */
-extern __inline _Mdouble_complex_
+__extern_inline _Mdouble_complex_
 __MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW
 {
   return __extension__ ~__z;

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_mutex.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_mutex.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_mutex.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -14,6 +14,7 @@
 
 #include <pthread.h>
 #include <bits/uClibc_pthread.h>
+#include <bits/libc-lock.h>
 
 #define __UCLIBC_MUTEX_TYPE				pthread_mutex_t
 

Modified: branches/uClibc-nptl/libc/sysdeps/linux/m68k/bits/mathinline.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/m68k/bits/mathinline.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libc/sysdeps/linux/m68k/bits/mathinline.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -351,14 +351,14 @@
 /* Note that there must be no whitespace before the argument passed for
    NAME, to make token pasting work correctly with -traditional.  */
 # define __inline_forward_c(rettype, name, args1, args2)	\
-extern __inline rettype __attribute__((__const__))		\
+__extern_inline rettype __attribute__((__const__))		\
   name args1							\
 {								\
   return __CONCAT(__,name) args2;				\
 }
 
 # define __inline_forward(rettype, name, args1, args2)	\
-extern __inline rettype name args1			\
+__extern_inline rettype name args1			\
 {							\
   return __CONCAT(__,name) args2;			\
 }

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -408,10 +408,10 @@
 
 
 /* Normal cleanup handling, based on C cleanup attribute.  */
-extern __inline void
+__extern_inline void
 __libc_cleanup_routine (struct __pthread_cleanup_frame *f);
 
-extern __inline void
+__extern_inline void
 __libc_cleanup_routine (struct __pthread_cleanup_frame *f)
 {
   if (f->__do_it)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h	2008-07-11 22:20:59 UTC (rev 22804)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h	2008-07-11 22:22:24 UTC (rev 22805)
@@ -65,22 +65,22 @@
 
 /* Mutex initializers.  */
 #define PTHREAD_MUTEX_INITIALIZER \
-  { { 0, 0, 0, 0, 0, 0 } }
+  { { 0, 0, 0, 0, 0, { 0 } } }
 #ifdef __USE_GNU
 # if __WORDSIZE == 64
 #  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0 } }
+  { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, { 0 } } }
 #  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0 } }
+  { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, { 0 } } }
 #  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0 } }
+  { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, { 0 } } }
 # else
 #  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, 0 } }
+  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0 } } }
 #  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, 0 } }
+  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, { 0 } } }
 #  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, 0 } }
+  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, { 0 } } }
 # endif
 #endif
 
@@ -535,10 +535,10 @@
    function the compiler is free to decide inlining the change when
    needed or fall back on the copy which must exist somewhere
    else.  */
-extern __inline void
+__extern_inline void
 __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame);
 
-extern __inline void
+__extern_inline void
 __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
 {
   if (__frame->__do_it)




More information about the uClibc-cvs mailing list