svn commit: trunk/uClibc/include

[aldot at uclibc.org]

Author: aldot
Date: 2007-02-05 04:33:30 -0800 (Mon, 05 Feb 2007)
New Revision: 17778

Log:
- silence warning about using an undefined token


Modified:
   trunk/uClibc/include/inttypes.h
   trunk/uClibc/include/obstack.h


Changeset:
Modified: trunk/uClibc/include/inttypes.h
===================================================================
--- trunk/uClibc/include/inttypes.h	2007-02-05 12:17:12 UTC (rev 17777)
+++ trunk/uClibc/include/inttypes.h	2007-02-05 12:33:30 UTC (rev 17778)
@@ -27,7 +27,7 @@
 /* Get the type definitions.  */
 #include <stdint.h>
 
-#if __UCLIBC_HAS_WCHAR__
+#if defined __UCLIBC_HAS_WCHAR__ && __UCLIBC_HAS_WCHAR__
 /* Get a definition for wchar_t.  But we must not define wchar_t itself.  */
 #ifndef ____gwchar_t_defined
 # ifdef __cplusplus
@@ -311,7 +311,7 @@
 extern uintmax_t strtoumax (__const char *__restrict __nptr,
 			    char ** __restrict __endptr, int __base) __THROW;
 
-#if __UCLIBC_HAS_WCHAR__
+#if defined __UCLIBC_HAS_WCHAR__ && __UCLIBC_HAS_WCHAR__
 /* Like `wcstol' but convert to `intmax_t'.  */
 extern intmax_t wcstoimax (__const __gwchar_t *__restrict __nptr,
 			   __gwchar_t **__restrict __endptr, int __base)

Modified: trunk/uClibc/include/obstack.h
===================================================================
--- trunk/uClibc/include/obstack.h	2007-02-05 12:17:12 UTC (rev 17777)
+++ trunk/uClibc/include/obstack.h	2007-02-05 12:33:30 UTC (rev 17778)
@@ -353,7 +353,7 @@
 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
    does not implement __extension__.  But that compiler doesn't define
    __GNUC_MINOR__.  */
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+# if __GNUC__ < 2 || (defined __NeXT__ && __NeXT__ && !__GNUC_MINOR__)
 #  define __extension__
 # endif