From 35728d4f142bbab0d8a963561d76b9066421b1ac Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 21 Jun 2002 18:15:56 +0000 Subject: 2002-06-21 Jeff Johnston * libc/include/math.h: Add to get _uint32_t definition. * libc/include/machine/types.h: Skip __off_t, __pid_t, and __loff_t definitions if special _HAVE_SYSTYPES macro defined. * libc/include/sys/config.h: Removed _uint*, _int* definitions. * libc/include/sys/param.h: Remove i386 case which is handled by default case. (BIG_ENDIAN, LITTLE_ENDIAN): Protect definitions in case they are already defined. (BYTE_ORDER): Add default case using _IEEE_BIG_ENDIAN and _IEEE_LITTLE_ENDIAN flags. * libc/include/sys/reent.h: Change __uint32_t references to use _ULong instead. (_REENT_GETDATE_REENT_P): New macro. * libc/include/sys/types.h (__int16_t, __uint16_t): Added. (__int32_t, __uint32_t, __int64_t, __uint64_t): Ditto. * libc/search/hash.h: Add default setting of BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN, if not already defined. * libc/sys/linux/sys/types.h: Include . Define ssize_t based on _ssize_t. Remove __socklen_t, __uintptr_t, pid_t, off_t, loff_t, caddr_t, and daddr_t type definitions which are done by subsequent glibc headers. Add macro definitions to prevent subsequent header files from defining pid_t, off_t, ssize_t, and key_t. Move uintptr_t and intptr_t to after glibc definitions of types they are based on. --- newlib/libc/include/sys/reent.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'newlib/libc/include/sys/reent.h') diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index f95d58e3e..39353cc42 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -73,14 +73,14 @@ struct _atexit { int _ind; /* next index in this table */ void (*_fns[_ATEXIT_SIZE])(void); /* the table itself */ void *_fnargs[_ATEXIT_SIZE]; /* fn args for on_exit */ - __uint32_t _fntypes; /* type of exit routine */ + __ULong _fntypes; /* type of exit routine */ }; #else struct _atexit { int _ind; /* next index in this table */ void (*_fns[_ATEXIT_SIZE])(void); /* the table itself */ void *_fnargs[_ATEXIT_SIZE]; /* fn args for on_exit */ - __uint32_t _fntypes; /* type of exit routine */ + __ULong _fntypes; /* type of exit routine */ }; #endif @@ -259,6 +259,7 @@ struct _misc_reent int _wctomb_state; int _mbtowc_state; char _l64a_buf[8]; + int _getdate_err; }; /* This version of _reent is layed our with "int"s in pairs, to help @@ -344,6 +345,7 @@ struct _reent var->__sf = 0; \ var->_misc = _NULL; \ var->_signal_buf = _NULL; \ + var->_getdate_err = 0; \ var->__sf_fake._p = _NULL; \ var->__sf_fake._r = 0; \ var->__sf_fake._w = 0; \ @@ -413,6 +415,7 @@ struct _reent _r->_misc->_wctomb_state = 0; \ _r->_misc->_mbtowc_state = 0; \ _r->_misc->_l64a_buf[0] = '\0'; \ + _r->_misc->_getdate_err = 0; \ } while (0) #define _REENT_CHECK_MISC(var) \ _REENT_CHECK(var, _misc, struct _misc_reent *, sizeof *((var)->_misc), _REENT_INIT_MISC(var)) @@ -437,6 +440,7 @@ struct _reent #define _REENT_MBTOWC_STATE(ptr)((ptr)->_misc->_mbtowc_state) #define _REENT_WCTOMB_STATE(ptr)((ptr)->_misc->_wctomb_state) #define _REENT_L64A_BUF(ptr) ((ptr)->_misc->_l64a_buf) +#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_misc->_getdate_err)) #define _REENT_SIGNAL_BUF(ptr) ((ptr)->_signal_buf) #else /* !_REENT_SMALL */ @@ -486,6 +490,7 @@ struct _reent int _wctomb_state; char _l64a_buf[8]; char _signal_buf[_REENT_SIGNAL_SIZE]; + int _getdate_err; } _reent; /* Two next two fields were once used by malloc. They are no longer used. They are used to preserve the space used before so as to @@ -518,7 +523,7 @@ struct _reent { 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}, \ - 0, 0, 0, ""} } } + 0, 0, 0, "", "", 0} } } #define _REENT_INIT_PTR(var) \ { int i; \ @@ -560,6 +565,7 @@ struct _reent var->_new._reent._wctomb_state = 0; \ var->_new._reent._l64a_buf[0] = '\0'; \ var->_new._reent._signal_buf[0] = '\0'; \ + var->_new._reent._getdate_err = 0; \ var->_atexit = _NULL; \ var->_atexit0._ind = 0; \ var->_atexit0._fns[0] = _NULL; \ @@ -597,6 +603,7 @@ struct _reent #define _REENT_WCTOMB_STATE(ptr)((ptr)->_new._reent._wctomb_state) #define _REENT_L64A_BUF(ptr) ((ptr)->_new._reent._l64a_buf) #define _REENT_SIGNAL_BUF(ptr) ((ptr)->_new._reent._signal_buf) +#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_new._reent._getdate_err)) #endif /* !_REENT_SMALL */ -- cgit v1.2.3