Changeset 2187 for trunk/src/emx/include/features.h

Timestamp:

Jul 3, 2005, 8:20:51 AM (20 years ago)

Author:

bird

Message:

Updated features.h and the gnu cdefs.h to 2.3.x CVS. level

File:

• trunk/src/emx/include/features.h (modified) (9 diffs, 1 prop)

trunk/src/emx/include/features.h

@@ -43 +43 @@
    _POSIX_C_SOURCE      If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
                         if >=199309L, add IEEE Std 1003.1b-1993;
-                        if >=199506L, add IEEE Std 1003.1c-1995
+                        if >=199506L, add IEEE Std 1003.1c-1995;
+                        if >=200112L, all of IEEE 1003.1-2004
    _XOPEN_SOURCE        Includes POSIX and XPG things.  Set to 500 if
                         Single Unix conformance is wanted, to 600 for the
@@ -56 +57 @@
    _REENTRANT           Select additionally reentrant object.
    _THREAD_SAFE         Same as _REENTRANT, often used by other systems.
+   _FORTIFY_SOURCE      If set to numeric value > 0 additional security
+                        measures are defined, according to level.
 
    The `-ansi' switch to the GNU C compiler defines __STRICT_ANSI__.
@@ -84 +87 @@
    __USE_GNU            Define GNU extensions.
    __USE_REENTRANT      Define reentrant/thread-safe *_r functions.
+   __USE_FORTIFY_LEVEL  Additional security measures used, according to level.
    __FAVOR_BSD          Favor 4.3BSD things in cases of conflict.
 
@@ -116 +120 @@
 #undef  __USE_GNU
 #undef  __USE_REENTRANT
+#undef  __USE_FORTIFY_LEVEL
 #undef  __FAVOR_BSD
 #undef  __KERNEL_STRICT_NAMES
@@ -128 +133 @@
 /* Always use ISO C things.  */
 #define __USE_ANSI      1
+
+/* Convenience macros to test the versions of glibc and gcc.
+   Use them like this:
+   #if __GNUC_PREREQ (2,8)
+   ... code requiring gcc 2.8 or later ...
+   #endif
+   Note - they won't work for gcc1 or glibc1, since the _MINOR macros
+   were not defined then.  */
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
 
 
@@ -218 +237 @@
 #endif
 
+
+#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 200112L /* bird: check if defined, -Wundef. */
+# define __USE_XOPEN2K          1
+#endif
+
 #ifdef  _XOPEN_SOURCE
 # define __USE_XOPEN    1
@@ -262 +286 @@
 # define __USE_BSD      1
 /* bird: __USE_BSD == __BSD_VISIBLE, make sure it's defined. */
-# if 1 /*def __EMX__ */
-#  undef __BSD_VISIBLE
-#  define __BSD_VISIBLE  1
-# endif
+# undef __BSD_VISIBLE
+# define __BSD_VISIBLE  1
 /* bird: end */
 #endif
@@ -283 +305 @@
 #if defined _REENTRANT || defined _THREAD_SAFE
 # define __USE_REENTRANT        1
+#endif
+
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && __GNUC_PREREQ (4, 1) && defined (__OPTIMIZE__) && __OPTIMIZE__ > 0 /* bird: check if defined, -Wundef. */
+# if _FORTIFY_SOURCE == 1
+#  define __USE_FORTIFY_LEVEL 1
+# elif _FORTIFY_SOURCE > 1
+#  define __USE_FORTIFY_LEVEL 2
+# endif
 #endif
 
@@ -305 +335 @@
    these macros to test for features in specific releases.  */
 #define __GLIBC__       2
-#define __GLIBC_MINOR__ 3
+#define __GLIBC_MINOR__ 4
 #endif /*bird*/
-
-/* Convenience macros to test the versions of glibc and gcc.
-   Use them like this:
-   #if __GNUC_PREREQ (2,8)
-   ... code requiring gcc 2.8 or later ...
-   #endif
-   Note - they won't work for gcc1 or glibc1, since the _MINOR macros
-   were not defined then.  */
-#if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
-        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define __GNUC_PREREQ(maj, min) 0
-#endif
 
 #define __GLIBC_PREREQ(maj, min) \