diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2001-08-29 23:47:43 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2001-08-29 23:47:43 +0400 |
| commit | 9e2a4ef876d6a0749af136d08e334adfec01f906 (patch) | |
| tree | 1fb49e158ae00835d03195684ad3a04e1932ee61 /newlib/libc/include | |
| parent | 3ab7340b9408983fb49bb7addd24b92a08eb3787 (diff) | |
2001-08-29 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/sys/reent.h: Add include of <sys/_types.h>.
No longer include time.h. Add struct __tm to use for
_localtime_buf in the reentrant structure. Add a
_NULL definition to use in initializing the reentrant struct.
* libc/include/sys/config.h: For CYGWIN32 and RTEMS, change
the _READ_WRITE_RETURN_TYPE to _ssize_t which is found in
<sys/_types.h>.
* libc/include/sys/unistd.h: Include <sys/_types.h>.
* libc/time/lcltime.c (localtime): Cast the reentrant struct
_localtime_buf to be struct tm *.
Diffstat (limited to 'newlib/libc/include')
| -rw-r--r-- | newlib/libc/include/sys/config.h | 4 | ||||
| -rw-r--r-- | newlib/libc/include/sys/reent.h | 22 | ||||
| -rw-r--r-- | newlib/libc/include/sys/unistd.h | 1 |
3 files changed, 22 insertions, 5 deletions
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h index 74860b808..683e5be92 100644 --- a/newlib/libc/include/sys/config.h +++ b/newlib/libc/include/sys/config.h @@ -128,7 +128,7 @@ typedef unsigned int __uint32_t; #if defined(__CYGWIN32__) || defined(__CYGWIN__) #define __FILENAME_MAX__ (260 - 1 /* NUL */) -#define _READ_WRITE_RETURN_TYPE ssize_t +#define _READ_WRITE_RETURN_TYPE _ssize_t #if defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB) #define __IMPORT #else @@ -138,7 +138,7 @@ typedef unsigned int __uint32_t; #if defined(__rtems__) #define __FILENAME_MAX__ 255 -#define _READ_WRITE_RETURN_TYPE ssize_t +#define _READ_WRITE_RETURN_TYPE _ssize_t #endif #ifndef __IMPORT diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index 7aae3f47b..65417f83a 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -11,7 +11,7 @@ extern "C" { #define _SYS_REENT_H_ #include <_ansi.h> -#include <time.h> +#include <sys/_types.h> #ifndef __Long #if __LONG_MAX__ == 2147483647L @@ -42,6 +42,20 @@ struct _Bigint __ULong _x[1]; }; +/* needed by reentrant structure */ +struct __tm +{ + int __tm_sec; + int __tm_min; + int __tm_hour; + int __tm_mday; + int __tm_mon; + int __tm_year; + int __tm_wday; + int __tm_yday; + int __tm_isdst; +}; + /* * atexit() support */ @@ -208,7 +222,7 @@ struct _reent unsigned int _unused_rand; char * _strtok_last; char _asctime_buf[26]; - struct tm _localtime_buf; + struct __tm _localtime_buf; int _gamma_signgam; __extension__ unsigned long long _rand_next; struct _rand48 _r48; @@ -238,9 +252,11 @@ struct _reent struct __sFILE __sf[3]; /* first three file descriptors */ }; +#define _NULL 0 + #define _REENT_INIT(var) \ { 0, &var.__sf[0], &var.__sf[1], &var.__sf[2], 0, "", 0, "C", \ - 0, NULL, NULL, 0, NULL, NULL, 0, NULL, { {0, NULL, "", \ + 0, _NULL, _NULL, 0, _NULL, _NULL, 0, _NULL, { {0, _NULL, "", \ { 0,0,0,0,0,0,0,0}, 0, 1, \ {{_RAND48_SEED_0, _RAND48_SEED_1, _RAND48_SEED_2}, \ {_RAND48_MULT_0, _RAND48_MULT_1, _RAND48_MULT_2}, _RAND48_ADD}} } } diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h index e80c942c9..efd8ebb7b 100644 --- a/newlib/libc/include/sys/unistd.h +++ b/newlib/libc/include/sys/unistd.h @@ -7,6 +7,7 @@ extern "C" { #include <_ansi.h> #include <sys/types.h> +#include <sys/_types.h> #define __need_size_t #define __need_ptrdiff_t #include <stddef.h> |