Menu
▾
▴
[MinGW-cvs] runtime/include/sys fcntl.h,1.1.1.1,1.2 file.h,1.1.1.1,1.2 locking.h,1.4,1.5 param.h,1.3,1.4 stat.h,1.5,1.6 time.h,1.2,1.3 timeb.h,1.4,1.5 types.h,1.6,1.7 unistd.h,1.1.1.1,1.2 utime.h,1.4,1.5
|
From: Earnie B. <ea...@us...> - 2004-04-19 17:22:52
|
Update of /cvsroot/mingw/runtime/include/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27954/include/sys Modified Files: fcntl.h file.h locking.h param.h stat.h time.h timeb.h types.h unistd.h utime.h Log Message: Merging changes from winsup Index: types.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/types.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** types.h 10 Oct 2003 15:11:05 -0000 1.6 --- types.h 19 Apr 2004 17:22:41 -0000 1.7 *************** *** 46,51 **** #endif ! ! #ifndef __STRICT_ANSI__ #ifndef _OFF_T_ --- 46,53 ---- #endif ! #ifndef _TIME64_T_DEFINED ! typedef __int64 __time64_t; ! #define _TIME64_T_DEFINED ! #endif #ifndef _OFF_T_ *************** *** 121,125 **** #endif /* Not _SSIZE_T_ */ - #endif /* Not __STRICT_ANSI__ */ #endif /* Not RC_INVOKED */ --- 123,126 ---- Index: time.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/time.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** time.h 12 Nov 2002 15:29:40 -0000 1.2 --- time.h 19 Apr 2004 17:22:41 -0000 1.3 *************** *** 2,6 **** #include <time.h> - #ifndef __STRICT_ANSI__ #ifndef _TIMEVAL_DEFINED /* also in winsock[2].h */ #define _TIMEVAL_DEFINED --- 2,5 ---- *************** *** 16,19 **** #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 #endif /* _TIMEVAL_DEFINED */ - - #endif /* __STRICT_ANSI__ */ --- 15,16 ---- Index: param.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/param.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** param.h 3 May 2003 13:48:47 -0000 1.3 --- param.h 19 Apr 2004 17:22:41 -0000 1.4 *************** *** 29,33 **** #include <limits.h> - #ifndef __STRICT_ANSI__ /* These are useful for cross-compiling */ #define BIG_ENDIAN 4321 --- 29,32 ---- *************** *** 38,41 **** #endif - - #endif --- 37,38 ---- Index: file.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/file.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file.h 4 Jun 2001 23:26:02 -0000 1.1.1.1 --- file.h 19 Apr 2004 17:22:41 -0000 1.2 *************** *** 5,9 **** * TODO? */ - #ifndef __STRICT_ANSI__ #include <fcntl.h> - #endif --- 5,7 ---- Index: fcntl.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/fcntl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fcntl.h 4 Jun 2001 23:26:02 -0000 1.1.1.1 --- fcntl.h 19 Apr 2004 17:22:41 -0000 1.2 *************** *** 4,8 **** * This fcntl.h maps to the root fcntl.h */ ! #ifndef __STRICT_ANSI__ #include <fcntl.h> - #endif --- 4,7 ---- * This fcntl.h maps to the root fcntl.h */ ! #include <fcntl.h> Index: stat.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/stat.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** stat.h 21 Feb 2003 21:19:52 -0000 1.5 --- stat.h 19 Apr 2004 17:22:41 -0000 1.6 *************** *** 26,31 **** */ - #ifndef __STRICT_ANSI__ - #ifndef _STAT_H_ #define _STAT_H_ --- 26,29 ---- *************** *** 133,136 **** --- 131,135 ---- time_t st_ctime; /* Creation time */ }; + #if defined (__MSVCRT__) struct _stati64 { *************** *** 147,150 **** --- 146,164 ---- time_t st_ctime; }; + + struct __stat64 + { + _dev_t st_dev; + _ino_t st_ino; + _mode_t st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; + }; #endif /* __MSVCRT__ */ #define _STAT_DEFINED *************** *** 159,172 **** _CRTIMP int __cdecl _stat (const char*, struct _stat*); - #if defined (__MSVCRT__) - _CRTIMP int __cdecl _fstati64(int, struct _stati64 *); - _CRTIMP int __cdecl _stati64(const char *, struct _stati64 *); - #if !defined ( _WSTAT_DEFINED) /* also declared in wchar.h */ - _CRTIMP int __cdecl _wstat(const wchar_t*, struct _stat*); - _CRTIMP int __cdecl _wstati64 (const wchar_t*, struct _stati64*); - #define _WSTAT_DEFINED - #endif /* _WSTAT_DEFIND */ - #endif /* __MSVCRT__ */ - #ifndef _NO_OLDNAMES --- 173,176 ---- *************** *** 178,181 **** --- 182,202 ---- #endif /* Not _NO_OLDNAMES */ + #if defined (__MSVCRT__) + _CRTIMP int __cdecl _fstati64(int, struct _stati64 *); + _CRTIMP int __cdecl _stati64(const char *, struct _stati64 *); + /* These require newer versions of msvcrt.dll (6.10 or higher). */ + #if __MSVCRT_VERSION__ >= 0x0601 + _CRTIMP int __cdecl _fstat64 (int, struct __stat64*); + _CRTIMP int __cdecl _stat64 (const char*, struct __stat64*); + #endif /* __MSVCRT_VERSION__ >= 0x0601 */ + #if !defined ( _WSTAT_DEFINED) /* also declared in wchar.h */ + _CRTIMP int __cdecl _wstat(const wchar_t*, struct _stat*); + _CRTIMP int __cdecl _wstati64 (const wchar_t*, struct _stati64*); + #if __MSVCRT_VERSION__ >= 0x0601 + _CRTIMP int __cdecl _wstat64 (const wchar_t*, struct __stat64*); + #endif /* __MSVCRT_VERSION__ >= 0x0601 */ + #define _WSTAT_DEFINED + #endif /* _WSTAT_DEFIND */ + #endif /* __MSVCRT__ */ #ifdef __cplusplus *************** *** 186,190 **** #endif /* Not _STAT_H_ */ - - #endif /* Not __STRICT_ANSI__ */ - --- 207,208 ---- Index: unistd.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/unistd.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** unistd.h 4 Jun 2001 23:26:03 -0000 1.1.1.1 --- unistd.h 19 Apr 2004 17:22:41 -0000 1.2 *************** *** 4,9 **** * unistd.h maps (roughly) to io.h */ - #ifndef __STRICT_ANSI__ #include <io.h> - #endif - --- 4,6 ---- Index: locking.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/locking.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** locking.h 29 Nov 2001 04:26:33 -0000 1.4 --- locking.h 19 Apr 2004 17:22:41 -0000 1.5 *************** *** 25,30 **** */ - #ifndef __STRICT_ANSI__ - #ifndef _LOCKING_H_ #define _LOCKING_H_ --- 25,28 ---- *************** *** 48,52 **** #endif /* Not _LOCKING_H_ */ - - #endif /* Not __STRICT_ANSI__ */ - --- 46,47 ---- Index: timeb.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/timeb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** timeb.h 21 Feb 2003 21:19:52 -0000 1.4 --- timeb.h 19 Apr 2004 17:22:41 -0000 1.5 *************** *** 25,30 **** */ - #ifndef __STRICT_ANSI__ - #ifndef _TIMEB_H_ #define _TIMEB_H_ --- 25,28 ---- *************** *** 32,35 **** --- 30,34 ---- /* All the headers include this file. */ #include <_mingw.h> + #include <sys/types.h> #ifndef RC_INVOKED *************** *** 59,62 **** --- 58,68 ---- #endif + struct __timeb64 + { + __time64_t time; + short millitm; + short timezone; + short dstflag; + }; #ifdef __cplusplus *************** *** 71,74 **** --- 77,85 ---- #endif /* Not _NO_OLDNAMES */ + /* This requires newer versions of msvcrt.dll (6.10 or higher). */ + #if __MSVCRT_VERSION__ >= 0x0601 + _CRTIMP void __cdecl _ftime64 (struct __timeb64*); + #endif /* __MSVCRT_VERSION__ >= 0x0601 */ + #ifdef __cplusplus } *************** *** 78,82 **** #endif /* Not _TIMEB_H_ */ - - #endif /* Not __STRICT_ANSI__ */ - --- 89,90 ---- Index: utime.h =================================================================== RCS file: /cvsroot/mingw/runtime/include/sys/utime.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utime.h 21 Feb 2003 21:19:52 -0000 1.4 --- utime.h 19 Apr 2004 17:22:41 -0000 1.5 *************** *** 24,30 **** * */ - - #ifndef __STRICT_ANSI__ - #ifndef _UTIME_H_ #define _UTIME_H_ --- 24,27 ---- *************** *** 61,64 **** --- 58,67 ---- #endif /* Not _NO_OLDNAMES */ + struct __utimbuf64 + { + __time64_t actime; + __time64_t modtime; + }; + #ifdef __cplusplus *************** *** 67,70 **** --- 70,78 ---- _CRTIMP int __cdecl _utime (const char*, struct _utimbuf*); + + #ifndef _NO_OLDNAMES + _CRTIMP int __cdecl utime (const char*, struct utimbuf*); + #endif /* Not _NO_OLDNAMES */ + _CRTIMP int __cdecl _futime (int, struct _utimbuf*); *************** *** 74,80 **** _CRTIMP int __cdecl _wutime (const wchar_t*, struct _utimbuf*); #endif /* MSVCRT runtime */ ! #ifndef _NO_OLDNAMES ! _CRTIMP int __cdecl utime (const char*, struct utimbuf*); ! #endif /* Not _NO_OLDNAMES */ #ifdef __cplusplus --- 82,92 ---- _CRTIMP int __cdecl _wutime (const wchar_t*, struct _utimbuf*); #endif /* MSVCRT runtime */ ! ! /* These require newer versions of msvcrt.dll (6.10 or higher). */ ! #if __MSVCRT_VERSION__ >= 0x0601 ! _CRTIMP int __cdecl _utime64 (const char*, struct __utimbuf64*); ! _CRTIMP int __cdecl _wutime64 (const wchar_t*, struct __utimbuf64*); ! _CRTIMP int __cdecl _futime64 (int, struct __utimbuf64*); ! #endif /* __MSVCRT_VERSION__ >= 0x0601 */ #ifdef __cplusplus *************** *** 85,89 **** #endif /* Not _UTIME_H_ */ - - #endif /* Not __STRICT_ANSI__ */ - --- 97,98 ---- |