Changeset 1065 for trunk/src/emx/include/sys/gnu

Timestamp:

Jan 25, 2004, 5:42:49 PM (22 years ago)

Author:

bird

Message:

Initial hacking.

File:

• trunk/src/emx/include/sys/gnu/cdefs.h (modified) (4 diffs, 1 prop)

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

@@ -16 +16 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
+
+/**
+ * GLIBC v2.3.2
+ * @changed bird: #ifndef'ed out a few clashes with the BSD cdefs.h.
+ */
 
 #ifndef _SYS_CDEFS_H
@@ -67 +72 @@
 /* For these things, GCC behaves the ANSI way normally,
    and the non-ANSI way under -traditional.  */
-
+#ifndef __CONCAT                        /* bird */
 #define __CONCAT(x,y)   x ## y
+#endif                                  /* bird */
+#ifndef __CONCAT                        /* bird */
 #define __STRING(x)     #x
+#endif                                  /* bird */
 
 /* This is not a typedef so `const __ptr_t' does the right thing.  */
@@ -77 +85 @@
 
 /* C++ needs to know that types and declarations are C, not C++.  */
+#if !defined(__BEGIN_DECLS) && !defined(__END_DECLS) /* bird */
 #ifdef  __cplusplus
 # define __BEGIN_DECLS  extern "C" {
@@ -84 +93 @@
 # define __END_DECLS
 #endif
-
+#endif                                  /* bird */
 
 /* The standard library needs the functions from the ISO C90 standard