From: Earnie B. <ea...@us...> - 2001-10-15 22:22:35
|
Update of /cvsroot/mingw/msys/rt/src/newlib/libc/include/sys In directory usw-pr-cvs1:/tmp/cvs-serv30329/newlib/libc/include/sys Modified Files: config.h errno.h reent.h unistd.h Log Message: Merge in cygwin-1.3.3 Index: config.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/newlib/libc/include/sys/config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.h 2001/09/22 17:43:44 1.2 --- config.h 2001/10/15 22:22:32 1.3 *************** *** 129,133 **** #if defined(__CYGWIN__) || defined(__MSYS__) #define __FILENAME_MAX__ (260 - 1 /* NUL */) ! #define _READ_WRITE_RETURN_TYPE ssize_t #if defined(__INSIDE_CYGWIN__) || defined(__INSIDE_MSYS__) || defined(_COMPILING_NEWLIB) #define __IMPORT --- 129,133 ---- #if defined(__CYGWIN__) || defined(__MSYS__) #define __FILENAME_MAX__ (260 - 1 /* NUL */) ! #define _READ_WRITE_RETURN_TYPE _ssize_t #if defined(__INSIDE_CYGWIN__) || defined(__INSIDE_MSYS__) || defined(_COMPILING_NEWLIB) #define __IMPORT *************** *** 139,143 **** #if defined(__rtems__) #define __FILENAME_MAX__ 255 ! #define _READ_WRITE_RETURN_TYPE ssize_t #endif --- 139,143 ---- #if defined(__rtems__) #define __FILENAME_MAX__ 255 ! #define _READ_WRITE_RETURN_TYPE _ssize_t #endif Index: errno.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/newlib/libc/include/sys/errno.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** errno.h 2001/09/22 17:43:44 1.2 --- errno.h 2001/10/15 22:22:32 1.3 *************** *** 16,21 **** --- 16,27 ---- #endif + /* Please don't use these variables directly. + Use strerror instead. */ extern __IMPORT _CONST char * _CONST _sys_errlist[]; extern __IMPORT int _sys_nerr; + #if defined (__CYGWIN__) || defined (__MSYS__) + extern __IMPORT const char * const sys_errlist[]; + extern __IMPORT int sys_nerr; + #endif #define __errno_r(ptr) ((ptr)->_errno) Index: reent.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/newlib/libc/include/sys/reent.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** reent.h 2001/08/07 17:49:48 1.1.1.1 --- reent.h 2001/10/15 22:22:32 1.2 *************** *** 12,16 **** #include <_ansi.h> ! #include <time.h> #ifndef __Long --- 12,16 ---- #include <_ansi.h> ! #include <sys/_types.h> #ifndef __Long *************** *** 43,46 **** --- 43,60 ---- }; + /* 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 *************** *** 209,213 **** char * _strtok_last; char _asctime_buf[26]; ! struct tm _localtime_buf; int _gamma_signgam; __extension__ unsigned long long _rand_next; --- 223,227 ---- char * _strtok_last; char _asctime_buf[26]; ! struct __tm _localtime_buf; int _gamma_signgam; __extension__ unsigned long long _rand_next; *************** *** 239,245 **** }; #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,0,0,0,0,0,0,0}, 0, 1, \ {{_RAND48_SEED_0, _RAND48_SEED_1, _RAND48_SEED_2}, \ --- 253,261 ---- }; + #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,0,0,0,0,0,0,0}, 0, 1, \ {{_RAND48_SEED_0, _RAND48_SEED_1, _RAND48_SEED_2}, \ Index: unistd.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/newlib/libc/include/sys/unistd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** unistd.h 2001/09/22 17:43:44 1.2 --- unistd.h 2001/10/15 22:22:32 1.3 *************** *** 8,11 **** --- 8,12 ---- #include <_ansi.h> #include <sys/types.h> + #include <sys/_types.h> #define __need_size_t #define __need_ptrdiff_t *************** *** 21,25 **** int _EXFUN(chmod, (const char *__path, mode_t __mode )); int _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group )); ! #if defined (__CYGWIN__) || defined (__MSYS__) int _EXFUN(chroot, (const char *__path )); #endif --- 22,26 ---- int _EXFUN(chmod, (const char *__path, mode_t __mode )); int _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group )); ! #if defined (__CYGWIN__) || defined(__rtems__) || defined (__MSYS__) int _EXFUN(chroot, (const char *__path )); #endif |