Changeset 1693

Timestamp:

Dec 3, 2004, 5:44:50 AM (21 years ago)

Author:

bird

Message:

BSD cleanup. rand() and stuff.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/thread.h (modified) (1 diff, 1 prop)
• alloca.h (modified) (1 diff, 1 prop)
• emx/io.h (modified) (2 diffs, 1 prop)
• math.h (modified) (1 diff, 1 prop)
• stdlib.h (modified) (15 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/thread.h

@@ -104 +104 @@
     /** The nesting depth of the default logger. */
     unsigned        cDefLoggerDepth;
-    /** Current rand() seed value. */
-    unsigned int    iRand;
     /** Buffer used by asctime() and indirectly by ctime() . (Adds two 2 bytes for padding). */
     char            szAscTimeAndCTimeBuf[26+2];

trunk/src/emx/include/alloca.h

@@ -10 +10 @@
 #include <stddef.h>
 
-#undef alloca
-
 __BEGIN_DECLS
-void *alloca(size_t);
+#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
+#undef  alloca  /* some GNU bits try to get cute and define this on their own */
+#define alloca(sz) __builtin_alloca(sz)
+#elif defined(lint)
+void    *alloca(size_t);
+#endif
 __END_DECLS
 
-#if !defined (alloca)
-#define alloca(x) __builtin_alloca(x)
-#endif
 
 #endif /* not _ALLOCA_H */

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

@@ -7 +7 @@
 #include <sys/types.h>
 #include <InnoTekLIBC/fork.h>
+#include <alloca.h>
 
 __BEGIN_DECLS
@@ -163 +164 @@
 #define _endbuf(s) (tbuf (s) ? _endbuf1 (s) : 0)
 
-#define alloca(x) __builtin_alloca(x)
-
 struct streamvec
 {

trunk/src/emx/include/math.h

@@ -143 +143 @@
 
 double atof (__const__ char *);
-
-#if !defined (_ABS_DECLARED) && !defined(_LABS_DECLARED)    /* see also stdlib.h */
-#define _ABS_DECLARED
-#define _LABS_DECLARED
-#if !defined (__GNUC__) || __GNUC__ >= 2
-extern int abs (int);
-extern long labs (long);
-#else
-extern __inline__ int abs (int _n) { return (_n < 0 ? -_n : _n); }
-extern __inline__ long labs (long _n) { return (_n < 0 ? -_n : _n); }
-#endif
-#endif
 
 #endif

trunk/src/emx/include/stdlib.h

@@ -1 +1 @@
 /* stdlib.h,v 1.24 2004/09/14 22:27:36 bird Exp */
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 5.3
  * @changed bird: EMXifications and OS2ifications.
  */
@@ -38 +38 @@
  *
  *      @(#)stdlib.h    8.5 (Berkeley) 5/19/95
- * $FreeBSD: src/include/stdlib.h,v 1.48 2003/03/12 20:29:58 das Exp $
+ * $FreeBSD: src/include/stdlib.h,v 1.56 2004/02/23 03:16:58 ache Exp $
  */
 
@@ -45 +45 @@
 
 #include <sys/cdefs.h>
+#include <sys/_null.h>
 #include <sys/_types.h>
 
@@ -78 +79 @@
 } ldiv_t;
 
-#ifndef NULL
-#define NULL    0
-#endif
-
 #define EXIT_FAILURE    1
 #define EXIT_SUCCESS    0
 
-#define RAND_MAX        0x7fff /* bird: emx, old value 0x7fffffff */
+#define RAND_MAX        0x7fffffff
 
 extern int _mb_cur_max;                 /* bird: one underscore, not two for us. */
@@ -92 +89 @@
 __BEGIN_DECLS
 void     abort(void) __dead2;
-#ifndef _ABS_DECLARED                   /* bird: emx, also math.h */
 int      abs(int) __pure2;
-#if !defined (__GNUC__) || __GNUC__ >= 2
-extern __inline__ int abs(int _n) { return (_n < 0 ? -_n : _n); }
-#endif
-#define _ABS_DECLARED
-#endif
 int      atexit(void (*)(void));
 double   atof(const char *);
@@ -110 +101 @@
 void     free(void *);
 char    *getenv(const char *);
-#ifndef _LABS_DECLARED                  /* bird: emx, also math.h */
 long     labs(long) __pure2;
-#if !defined (__GNUC__) || __GNUC__ >= 2
-extern __inline__ long labs(long _n) { return (_n < 0 ? -_n : _n); }
-#endif
-#define _LABS_DECLARED
-#endif
 ldiv_t   ldiv(long, long) __pure2;
 void    *malloc(size_t);
@@ -163 +148 @@
          llabs(long long) __pure2;
 /* LONGLONG */
-/** @todo lldiv_t        lldiv(long long, long long) __pure2; */
+lldiv_t  lldiv(long long, long long) __pure2;
 /* LONGLONG */
 long long
@@ -182 +167 @@
 #if __POSIX_VISIBLE /* >= ??? */
 int      posix_memalign(void **, size_t, size_t); /* bird: we implement this. */
-/** @todo int    rand_r(unsigned *);    */              /* (TSF) */
+int      rand_r(unsigned *);                    /* (TSF) */
 int      setenv(const char *, const char *, int);
 int      unsetenv(const char *);        /* bird: standard saith shall return int. */
@@ -201 +186 @@
 /* char *fcvt(double, int, int * __restrict, int * __restrict); */
 /* char *gcvt(double, int, int * __restrict, int * __restrict); */
-#ifndef _GETSUBOPT_DECLARED
-/** @todo int    getsubopt(char **, char *const *, char **); */
-#define _GETSUBOPT_DECLARED
-#endif
+int      getsubopt(char **, char *const *, char **);
 /** @todo int    grantpt(int); */
 char    *initstate(unsigned long /* XSI requires u_int */, char *, long);
@@ -243 +225 @@
             const char *);
 
-void    *alloca(size_t);                /* built-in for gcc */
+/*
+ * The alloca() function can't be implemented in C, and on some
+ * platforms it can't be implemented at all as a callable function.
+ * The GNU C compiler provides a built-in alloca() which we can use;
+ * in all other cases, provide a prototype, mainly to pacify various
+ * incarnations of lint.  On platforms where alloca() is not in libc,
+ * programs which use it will fail to link when compiled with non-GNU
+ * compilers.
+ */
+#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
+#undef  alloca  /* some GNU bits try to get cute and define this on their own */
+#define alloca(sz) __builtin_alloca(sz)
+#elif defined(lint)
+void    *alloca(size_t);
+#endif
+
 /** @todo __uint32_t
          arc4random(void); */
@@ -263 +260 @@
 /** @todo int    daemon(int, int); */
 /** @todo char  *devname(int, int); */
+/** @todo char  *devname_r(int, int, char *, int); */
 int      getloadavg(double [], int);
 __const char *
@@ -277 +275 @@
 int      sradixsort(const unsigned char **, int, const unsigned char *,
             unsigned);
-/** @todo void   sranddev(void); */
+void     sranddev(void);
 void     srandomdev(void);
 
@@ -285 +283 @@
 /** @todo __uint64_t
          strtouq(const char *, char **, int); */
+
+extern char *suboptarg;                 /* getsubopt(3) external variable */
 #endif /* __BSD_VISIBLE */
 
@@ -292 +292 @@
 #ifdef __BSD_VISIBLE
 char    *_getcwdux(char *, size_t);
-/* todo: int     _chdirux(char *); */
+/** @todo: int     _chdirux(char *); */
 char    *_realrealpath(const char *, char *, size_t);
 #endif
@@ -486 +486 @@
 __END_DECLS
 
-/* bird: EMX/PC stuff - start  */
+/* bird: EMX/PC stuff - end */
 
 #endif /* !_STDLIB_H_ */