summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/inttypes.h4
-rw-r--r--include/obstack.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/inttypes.h b/include/inttypes.h
index 6e0210087..6ae329537 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -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 intmax_t strtoimax (__const char *__restrict __nptr,
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)
diff --git a/include/obstack.h b/include/obstack.h
index 2a708c53a..071acaff0 100644
--- a/include/obstack.h
+++ b/include/obstack.h
@@ -353,7 +353,7 @@ extern int obstack_exit_failure;
/* 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