Changeset 1065

Timestamp:

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

Author:

bird

Message:

Initial hacking.

Location:

trunk/src/emx/include

Files:

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

trunk/src/emx/include/features.h

@@ -16 +16 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
+
+/** @file
+ * GLIBC v2.3.2
+ * @changed bird: don't define *LARGEFILE64*, but make sure to indicate that
+ *                off_t is 64bits.
+ */
 
 #ifndef _FEATURES_H
@@ -135 +141 @@
 # define _XOPEN_SOURCE_EXTENDED 1
 # undef  _LARGEFILE64_SOURCE
+#ifndef __EMX__ /* bird */
 # define _LARGEFILE64_SOURCE    1
+#endif          /* bird */
 # undef  _BSD_SOURCE
 # define _BSD_SOURCE    1
@@ -212 +220 @@
 #endif
 
+#ifndef __EMX__ /* bird */
 #ifdef _LARGEFILE64_SOURCE
 # define __USE_LARGEFILE64      1
 #endif
-
+#endif /* bird */
+
+#ifndef __EMX__ /* bird */
 #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64
 # define __USE_FILE_OFFSET64    1
 #endif
+#else
+# define __USE_FILE_OFFSET64    1
+#endif          /* bird */
 
 #if defined _BSD_SOURCE || defined _SVID_SOURCE
@@ -296 +310 @@
 # if defined __USE_FILE_OFFSET64 && !defined __REDIRECT
 #  define __USE_LARGEFILE       1
+#ifndef __EMX__ /* bird */
 #  define __USE_LARGEFILE64     1
+#endif          /* bird */
 # endif
 
@@ -308 +324 @@
 
 
+#ifndef __EMX__ /* bird */
 /* This is here only because every header file already includes this one.
    Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
@@ -313 +330 @@
    that will always return failure (and set errno to ENOSYS).  */
 #include <gnu/stubs.h>
+#endif          /* bird */
 
 

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