Changeset 1087


Ignore:
Timestamp:
Jan 26, 2004, 2:28:58 AM (22 years ago)
Author:
bird
Message:

USE_EMX and _POSIX_[C_]SOURCE problems with new features.h.

Location:
trunk/src/emx/include
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/emx/include/emx/fnmatch.h

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r1086 r1087  
    1919
    2020
    21 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
     21#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    2222
    2323/* emx extensions */

  • trunk/src/emx/include/features.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1086 r1087  
    2222 *                off_t is 64bits.
    2323 * @changed bird: not GLIBC version numbers.
     24 * @chagned bird: _GNU_SOURCE should not set _POSIX_SOURCE or _POSIX_C_SOURCE as that
     25 *                means somewhat imporatant exclusions in EMX and BSD style headers.
     26 *                Some of this have been fixed by __USE_EMX/_EMX_SOURCE, but that's
     27 *                not gonna help enough.
    2428 */
    2529
    … …  
    110114#undef  __FAVOR_BSD
    111115#undef  __KERNEL_STRICT_NAMES
     116#ifdef __EMX__                          /* bird */
     117#undef  __USE_EMX                       /* bird */
     118#endif                                  /* bird */
    112119
    113120/* Suppress kernel-name space pollution unless user expressedly asks
    … …  
    133140# undef  _ISOC99_SOURCE
    134141# define _ISOC99_SOURCE 1
     142/* bird: sorry, but this isn't causing huge exclusions for BSD or EMX headers. */
     143#ifndef __EMX__                         /* bird */
    135144# undef  _POSIX_SOURCE
    136145# define _POSIX_SOURCE  1
    137146# undef  _POSIX_C_SOURCE
    138147# define _POSIX_C_SOURCE        199506L
     148#else                                   /* bird */
     149# define __USE_POSIX199309      1       /* bird */
     150# define __USE_POSIX199506      1       /* bird */
     151#endif                                  /* bird */
    139152# undef  _XOPEN_SOURCE
    140153# define _XOPEN_SOURCE  600
    … …  
    149162# undef  _SVID_SOURCE
    150163# define _SVID_SOURCE   1
     164# ifdef __EMX__
     165#  define _EMX_SOURCE   1
     166# endif
    151167#endif
    152168
    … …  
    259275#endif
    260276
     277#if defined(__EMX__) && defined(_EMX_SOURCE) /* bird */
     278# define __USE_EMX      1               /* bird */
     279#endif                                  /* bird */
     280
    261281#if defined _REENTRANT || defined _THREAD_SAFE
    262282# define __USE_REENTRANT        1

  • trunk/src/emx/include/float.h

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r1086 r1087  
    6262
    6363
    64 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
     64#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    6565
    6666#define M_E             2.71828182845904523536

  • trunk/src/emx/include/io.h

    • Property cvs2svn:cvs-rev changed from 1.8 to 1.9
    r1086 r1087  
    8686int write (int, __const__ void *, size_t);
    8787
    88 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    89     || defined (_WITH_UNDERSCORE)
     88#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    9089
    9190int _access (__const__ char *, int);

  • trunk/src/emx/include/malloc.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1086 r1087  
    2929
    3030
    31 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    32     || defined (_WITH_UNDERSCORE)
     31#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    3332
    3433#if !defined (_HEAPOK)

  • trunk/src/emx/include/pwd.h

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r1086 r1087  
    4545struct passwd *_getpwnam (__const__ char *);
    4646
    47 #if !defined (_POSIX_SOURCE)
     47#if !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    4848
    4949struct passwd *getpwent (void);

  • trunk/src/emx/include/stddef.h

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r1086 r1087  
    7979/* bird: EMX - start */
    8080#define _PTRDIFF_T
    81 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    82     || defined (_WITH_UNDERSCORE)
     81#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    8382unsigned *__threadid (void);
    8483#define _threadid (__threadid ())

  • trunk/src/emx/include/stdio.h

    • Property cvs2svn:cvs-rev changed from 1.9 to 1.10
    r1086 r1087  
    524524extern __inline__ int putchar (int _c) { return putc (_c, stdout); }
    525525
    526 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
     526#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    527527
    528528char *cuserid (char *);
    … …  
    535535
    536536
    537 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    538     || defined (_WITH_UNDERSCORE)
     537#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    539538
    540539int _fcloseall (void);

  • trunk/src/emx/include/stdlib.h

    • Property cvs2svn:cvs-rev changed from 1.19 to 1.20
    r1086 r1087  
    300300#endif
    301301
    302 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
     302#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    303303
    304304#if !defined (OS2_MODE)
    … …  
    382382
    383383
    384 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    385     || defined (_WITH_UNDERSCORE)
     384#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    386385
    387386extern char **_environ;

  • trunk/src/emx/include/string.h

    • Property cvs2svn:cvs-rev changed from 1.10 to 1.11
    r1086 r1087  
    125125/* bird: EMX stuff - start */
    126126
    127 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
     127#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    128128#if !defined (_MEMDIF_EQ)
    129129#define _MEMDIF_EQ 0xffffffff
    … …  
    144144#endif
    145145
    146 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) \
    147     || defined (_WITH_UNDERSCORE)
     146#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    148147size_t _memcount (__const__ void *, int, size_t);
    149148size_t _memdif (__const__ void *, __const__ void *, size_t);

  • trunk/src/emx/include/sys/fcntl.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1086 r1087  
    283283#define O_BINARY        0x0100
    284284#define O_SIZE          0x0020          /* EMX used 0x8000 for O_SIZE. */
    285 #if !defined (_POSIX_SOURCE)
     285#if !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    286286#define O_NOINHERIT     0x1000          /* EMX used 0x1000 for O_NOINHERIT. */
    287287#endif
    … …  
    302302#endif
    303303
    304 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
     304#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    305305__BEGIN_DECLS
    306306int _creat (__const__ char *, int);

  • trunk/src/emx/include/sys/signal.h

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r1086 r1087  
    104104
    105105
    106 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
     106#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    107107
    108108#define SIG_ACK ((void (*)(int))4)

  • trunk/src/emx/include/sys/stat.h

    • Property cvs2svn:cvs-rev changed from 1.6 to 1.7
    r1086 r1087  
    353353
    354354/* bird: emx stuff - start */
    355 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
     355#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    356356int _chmod (__const__ char *, int);
    357357int _fstat (int, struct stat *);

  • trunk/src/emx/include/sys/types.h

    • Property cvs2svn:cvs-rev changed from 1.7 to 1.8
    r1086 r1087  
    346346
    347347/* bird: OS/2 Toolkit Pollution. */
    348 #if !defined (_POSIX_SOURCE)
     348#if !defined (_POSIX_SOURCE) || defined(__USE_EMX)
    349349#ifdef __32BIT__
    350350typedef int             long_int;       /* 32-bit compilers */

  • trunk/src/emx/include/sys/wait.h

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r1086 r1087  
    2222int waitpid (int, int *, int);
    2323
    24 #if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
     24#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    2525
    2626int _wait (int *);

  • trunk/src/emx/include/time.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1086 r1087  
    190190
    191191/* bird: EMX/VAC/MSC legacy start. */
    192 #if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE)
     192#if (!defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
    193193extern int _daylight;
    194194extern long _timezone;
Note: See TracChangeset for help on using the changeset viewer.