Changeset 1299

Timestamp:

Mar 15, 2004, 4:30:37 PM (21 years ago)

Author:

bird

Message:

Check if stuff is defined before accessing it in #if. Stops -Wundef from bitching.

Location:

trunk/src/emx/include

Files:

• features.h (modified) (3 diffs, 1 prop)
• sys/cdefs.h (modified) (4 diffs, 1 prop)

trunk/src/emx/include/features.h

@@ -22 +22 @@
  *                off_t is 64bits.
  * @changed bird: not GLIBC version numbers.
- * @chagned bird: _GNU_SOURCE should not set _POSIX_SOURCE or _POSIX_C_SOURCE as that
+ * @changed bird: _GNU_SOURCE should not set _POSIX_SOURCE or _POSIX_C_SOURCE as that
  *                means somewhat imporatant exclusions in EMX and BSD style headers.
  *                Some of this have been fixed by __USE_EMX/_EMX_SOURCE, but that's
  *                not gonna help enough.
+ * @changed bird: Check if stuff is defined before accessing it in #if. Stops -Wundef
+ *                from bitching.
  */
 
@@ -200 +202 @@
 #endif /* bird */
 
-#ifdef __EMX__ /* This spawns warnings with -Wundef. */
-#if defined _POSIX_SOURCE || (defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 1) || defined _XOPEN_SOURCE
+#if defined _POSIX_SOURCE || (defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 1) || defined _XOPEN_SOURCE /* bird: check if defined, -Wundef. */
 # define __USE_POSIX    1
-#endif
-#else
-#if defined _POSIX_SOURCE || _POSIX_C_SOURCE >= 1 || defined _XOPEN_SOURCE
-# define __USE_POSIX    1
-#endif
 #endif
 
@@ -214 +210 @@
 #endif
 
-#if (_POSIX_C_SOURCE - 0) >= 199309L
+#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199309L /* bird: check if defined, -Wundef. */
 # define __USE_POSIX199309      1
 #endif
 
-#if (_POSIX_C_SOURCE - 0) >= 199506L
+#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199506L /* bird: check if defined, -Wundef. */
 # define __USE_POSIX199506      1
 #endif

trunk/src/emx/include/sys/cdefs.h

@@ -43 +43 @@
  * @changed bird: Toolkit compatibility (_CDEFS_H_ and __TCPROTO()).
  * @changed zap:  _System definition for older GCC compilers.
+ * @changed bird: Check if stuff is defined before accessing it in #if. Stops -Wundef
+ *                from bitching.
  */
 
@@ -199 +201 @@
 
 /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if __FreeBSD_cc_version >= 300001
+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 /* bird: check if defined to avoid -Wundef messages */
 #define __printf0like(fmtarg, firstvararg) \
             __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
@@ -319 +321 @@
 
 /* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if _POSIX_C_SOURCE == 1
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1 /* bird: check if defined to avoid -Wundef message. */
 #undef _POSIX_C_SOURCE          /* Probably illegal, but beyond caring now. */
 #define _POSIX_C_SOURCE         199009
@@ -325 +327 @@
 
 /* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if _POSIX_C_SOURCE == 2
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2 /* bird: check if defined to avoid -Wundef message. */
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE         199209