diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/assert.h include/assert.h *** include-orig/assert.h Sun May 2 11:43:58 2004 --- include/assert.h Mon May 3 23:22:31 2004 *************** *** 53,55 **** --- 53,56 ---- #endif /* Not _ASSERT_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/ctype.h include/ctype.h *** include-orig/ctype.h Sun May 2 11:43:58 2004 --- include/ctype.h Mon May 3 23:22:31 2004 *************** *** 242,244 **** --- 242,245 ---- #endif /* Not _CTYPE_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/dirent.h include/dirent.h *** include-orig/dirent.h Sun May 2 11:43:58 2004 --- include/dirent.h Mon May 3 23:27:55 2004 *************** *** 1,124 **** ! /* ! * DIRENT.H (formerly DIRLIB.H) ! * This file has no copyright assigned and is placed in the Public Domain. ! * This file is a part of the mingw-runtime package. ! * No warranty is given; refer to the file DISCLAIMER within the package. ! * ! */ ! #ifndef _DIRENT_H_ ! #define _DIRENT_H_ ! /* All the headers include this file. */ #include <_mingw.h> ! ! #include ! ! #ifndef RC_INVOKED ! ! #ifdef __cplusplus ! extern "C" { #endif ! struct dirent ! { ! long d_ino; /* Always zero. */ ! unsigned short d_reclen; /* Always zero. */ ! unsigned short d_namlen; /* Length of name in d_name. */ ! char d_name[FILENAME_MAX]; /* File name. */ ! }; ! ! /* ! * This is an internal data structure. Good programmers will not use it ! * except as an argument to one of the functions below. ! * dd_stat field is now int (was short in older versions). ! */ ! typedef struct ! { ! /* disk transfer area for this dir */ ! struct _finddata_t dd_dta; ! ! /* dirent struct to return from dir (NOTE: this makes this thread ! * safe as long as only one thread uses a particular DIR struct at ! * a time) */ ! struct dirent dd_dir; ! ! /* _findnext handle */ ! long dd_handle; ! ! /* ! * Status of search: ! * 0 = not started yet (next entry to read is first entry) ! * -1 = off the end ! * positive = 0 based index of next entry ! */ ! int dd_stat; ! ! /* given path for dir with search pattern (struct is extended) */ ! char dd_name[1]; ! } DIR; ! ! DIR* __cdecl opendir (const char*); ! struct dirent* __cdecl readdir (DIR*); ! int __cdecl closedir (DIR*); ! void __cdecl rewinddir (DIR*); ! long __cdecl telldir (DIR*); ! void __cdecl seekdir (DIR*, long); ! ! ! /* wide char versions */ ! ! struct _wdirent ! { ! long d_ino; /* Always zero. */ ! unsigned short d_reclen; /* Always zero. */ ! unsigned short d_namlen; /* Length of name in d_name. */ ! wchar_t d_name[FILENAME_MAX]; /* File name. */ ! /* NOTE: The name in the dirent structure points to the name in the * wfinddata_t structure in the _WDIR. */ ! }; ! ! /* ! * This is an internal data structure. Good programmers will not use it ! * except as an argument to one of the functions below. ! */ ! typedef struct ! { ! /* disk transfer area for this dir */ ! struct _wfinddata_t dd_dta; ! ! /* dirent struct to return from dir (NOTE: this makes this thread ! * safe as long as only one thread uses a particular DIR struct at ! * a time) */ ! struct _wdirent dd_dir; ! ! /* _findnext handle */ ! long dd_handle; ! ! /* ! * Status of search: ! * 0 = not started yet (next entry to read is first entry) ! * -1 = off the end ! * positive = 0 based index of next entry ! */ ! int dd_stat; ! ! /* given path for dir with search pattern (struct is extended) */ ! wchar_t dd_name[1]; ! } _WDIR; ! ! ! ! _WDIR* __cdecl _wopendir (const wchar_t*); ! struct _wdirent* __cdecl _wreaddir (_WDIR*); ! int __cdecl _wclosedir (_WDIR*); ! void __cdecl _wrewinddir (_WDIR*); ! long __cdecl _wtelldir (_WDIR*); ! void __cdecl _wseekdir (_WDIR*, long); ! ! ! #ifdef __cplusplus ! } ! #endif ! ! #endif /* Not RC_INVOKED */ ! ! #endif /* Not _DIRENT_H_ */ --- 1,17 ---- ! #ifndef __STRICT_ANSI__ ! #ifndef _DIRENT_H_ ! ! /* All the headers include this file. */ #include <_mingw.h> ! #ifdef __GW32__ ! #include ! #include ! #else ! #include #endif + #define _DIRENT_H_ + + #endif /* Not _DIRENT_H_ */ ! #endif __STRICT_ANSI__ diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/errno.h include/errno.h *** include-orig/errno.h Sun May 2 11:43:58 2004 --- include/errno.h Mon May 3 23:22:31 2004 *************** *** 99,101 **** --- 99,102 ---- #endif /* Not RC_INVOKED */ #endif /* Not _ERRNO_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/fcntl.h include/fcntl.h *** include-orig/fcntl.h Sun May 2 11:43:58 2004 --- include/fcntl.h Mon May 3 23:28:29 2004 *************** *** 67,69 **** --- 67,71 ---- #endif /* Not _NO_OLDNAMES */ #endif /* Not _FCNTL_H_ */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/getopt.h include/getopt.h *** include-orig/getopt.h Sun May 2 11:43:58 2004 --- include/getopt.h Mon May 3 23:22:31 2004 *************** *** 82,84 **** --- 82,86 ---- #endif /* __GETOPT_LONG_H__ */ #endif /* __UNISTD_GETOPT__ */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/io.h include/io.h *** include-orig/io.h Sun May 2 11:43:58 2004 --- include/io.h Mon May 3 23:28:50 2004 *************** *** 151,157 **** #ifndef _UWIN _CRTIMP int __cdecl chdir (const char*); _CRTIMP char* __cdecl getcwd (char*, int); ! _CRTIMP int __cdecl mkdir (const char*); _CRTIMP char* __cdecl mktemp (char*); _CRTIMP int __cdecl rmdir (const char*); _CRTIMP int __cdecl chmod (const char*, int); --- 151,157 ---- #ifndef _UWIN _CRTIMP int __cdecl chdir (const char*); _CRTIMP char* __cdecl getcwd (char*, int); ! /* _CRTIMP int __cdecl mkdir (const char*); */ _CRTIMP char* __cdecl mktemp (char*); _CRTIMP int __cdecl rmdir (const char*); _CRTIMP int __cdecl chmod (const char*, int); *************** *** 303,305 **** --- 303,307 ---- #endif /* Not RC_INVOKED */ #endif /* _IO_H_ not defined */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/limits.h include/limits.h *** include-orig/limits.h Sun May 2 11:43:58 2004 --- include/limits.h Mon May 3 23:22:31 2004 *************** *** 113,115 **** --- 113,116 ---- #endif /* not _LIMITS_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/locale.h include/locale.h *** include-orig/locale.h Sun May 2 11:43:58 2004 --- include/locale.h Mon May 3 23:22:31 2004 *************** *** 86,88 **** --- 86,89 ---- #endif /* Not _LOCALE_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/malloc.h include/malloc.h *** include-orig/malloc.h Sun May 2 11:43:58 2004 --- include/malloc.h Mon May 3 23:30:20 2004 *************** *** 80,82 **** --- 80,84 ---- #endif /* RC_INVOKED */ #endif /* Not _MALLOC_H_ */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/math.h include/math.h *** include-orig/math.h Sun May 2 11:43:58 2004 --- include/math.h Mon May 3 23:22:31 2004 *************** *** 757,759 **** --- 757,760 ---- #endif /* Not _MATH_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/ntdll.h include/ntdll.h *** include-orig/ntdll.h Sun Feb 15 09:52:12 2004 --- include/ntdll.h Mon May 3 23:22:31 2004 *************** *** 1,15 **** ! #ifndef _NTDLL_H ! #define _NTDLL_H ! #if __GNUC__ >=3 ! #pragma GCC system_header ! #endif ! ! typedef enum _SHUTDOWN_ACTION { ! ShutdownNoReboot, ! ShutdownReboot, ! ShutdownPowerOff ! } SHUTDOWN_ACTION; ! ! DWORD WINAPI NtShutdownSystem (SHUTDOWN_ACTION Action); ! ! #endif /* _NTDLL_H */ --- 1 ---- ! #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/search.h include/search.h *** include-orig/search.h Sun May 2 11:44:00 2004 --- include/search.h Mon May 3 23:22:31 2004 *************** *** 62,64 **** --- 62,66 ---- #endif /* RC_INVOKED */ #endif /* _SEARCH_H_ */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/signal.h include/signal.h *** include-orig/signal.h Sun May 2 11:44:00 2004 --- include/signal.h Mon May 3 23:22:31 2004 *************** *** 96,98 **** --- 96,99 ---- #endif /* Not _SIGNAL_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/stdarg.h include/stdarg.h *** include-orig/stdarg.h Sun May 2 11:44:00 2004 --- include/stdarg.h Mon May 3 23:22:31 2004 *************** *** 5,7 **** --- 5,8 ---- #ifndef RC_INVOKED #include_next #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/stddef.h include/stddef.h *** include-orig/stddef.h Sun May 2 11:44:00 2004 --- include/stddef.h Mon May 3 23:22:31 2004 *************** *** 5,7 **** --- 5,8 ---- #ifndef RC_INVOKED #include_next #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/stdint.h include/stdint.h *** include-orig/stdint.h Sun May 2 11:44:00 2004 --- include/stdint.h Mon May 3 23:22:31 2004 *************** *** 182,184 **** --- 182,185 ---- #endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/stdio.h include/stdio.h *** include-orig/stdio.h Sun May 2 11:44:00 2004 --- include/stdio.h Mon May 3 23:22:31 2004 *************** *** 480,482 **** --- 480,483 ---- #endif /* Not RC_INVOKED */ #endif /* _STDIO_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/stdlib.h include/stdlib.h *** include-orig/stdlib.h Sun May 2 11:44:00 2004 --- include/stdlib.h Mon May 3 23:22:31 2004 *************** *** 522,524 **** --- 522,525 ---- #endif /* Not _STDLIB_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/string.h include/string.h *** include-orig/string.h Sun May 2 11:44:00 2004 --- include/string.h Mon May 3 23:22:31 2004 *************** *** 192,194 **** --- 192,195 ---- #endif /* Not _STRING_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/sys/param.h include/sys/param.h *** include-orig/sys/param.h Sun May 2 11:44:00 2004 --- include/sys/param.h Mon May 3 23:22:31 2004 *************** *** 20,22 **** --- 20,23 ---- #define MAXPATHLEN PATH_MAX #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/sys/stat.h include/sys/stat.h *** include-orig/sys/stat.h Sun May 2 11:44:00 2004 --- include/sys/stat.h Mon May 3 23:22:31 2004 *************** *** 99,104 **** --- 99,105 ---- time_t st_ctime; /* Creation time */ }; + #ifndef __GW32__ struct stat { _dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */ *************** *** 158,167 **** --- 159,170 ---- #ifndef _NO_OLDNAMES + #ifndef __GW32__ /* These functions live in liboldnames.a. */ _CRTIMP int __cdecl fstat (int, struct stat*); _CRTIMP int __cdecl chmod (const char*, int); _CRTIMP int __cdecl stat (const char*, struct stat*); + #endif /* __GW32__ */ #endif /* Not _NO_OLDNAMES */ diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/sys/types.h include/sys/types.h *** include-orig/sys/types.h Sun May 2 11:44:02 2004 --- include/sys/types.h Mon May 3 23:22:31 2004 *************** *** 109,111 **** --- 109,112 ---- #endif /* Not RC_INVOKED */ #endif /* Not _TYPES_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/time.h include/time.h *** include-orig/time.h Sun May 2 11:44:00 2004 --- include/time.h Mon May 3 23:22:31 2004 *************** *** 217,219 **** --- 217,220 ---- #endif /* Not _TIME_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/unistd.h include/unistd.h *** include-orig/unistd.h Sun May 2 11:44:00 2004 --- include/unistd.h Mon May 3 23:29:49 2004 *************** *** 15,17 **** --- 15,19 ---- #undef __UNISTD_GETOPT__ #endif /* _UNISTD_H */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/wchar.h include/wchar.h *** include-orig/wchar.h Sun May 2 11:44:00 2004 --- include/wchar.h Mon May 3 23:22:31 2004 *************** *** 189,194 **** --- 189,195 ---- time_t st_ctime; /* Creation time */ }; + #ifndef __GW32__ struct stat { _dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */ *************** *** 204,209 **** --- 205,212 ---- time_t st_mtime; /* Modified time */ time_t st_ctime; /* Creation time */ }; + #endif + #if defined (__MSVCRT__) struct _stati64 { _dev_t st_dev; *************** *** 343,345 **** --- 346,349 ---- #endif /* not _WCHAR_H_ */ + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/winbase.h include/winbase.h *** include-orig/winbase.h Sun Feb 15 09:52:14 2004 --- include/winbase.h Mon May 3 23:22:31 2004 *************** *** 2315,2317 **** --- 2315,2319 ---- } #endif #endif /* _WINBASE_H */ + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/windef.h include/windef.h *** include-orig/windef.h Sun Feb 15 09:52:14 2004 --- include/windef.h Mon May 3 23:22:31 2004 *************** *** 329,331 **** --- 329,332 ---- } #endif #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/windows.h include/windows.h *** include-orig/windows.h Sun Feb 15 09:52:16 2004 --- include/windows.h Mon May 3 23:22:31 2004 *************** *** 126,128 **** --- 126,130 ---- #endif #endif + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/wingdi.h include/wingdi.h *** include-orig/wingdi.h Sun Feb 15 09:52:16 2004 --- include/wingdi.h Mon May 3 23:22:31 2004 *************** *** 2979,2981 **** --- 2979,2982 ---- } #endif #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/winnt.h include/winnt.h *** include-orig/winnt.h Sun Feb 15 09:52:16 2004 --- include/winnt.h Mon May 3 23:22:31 2004 *************** *** 3339,3341 **** --- 3339,3343 ---- } #endif #endif + + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/winsock.h include/winsock.h *** include-orig/winsock.h Sun Feb 15 09:52:16 2004 --- include/winsock.h Mon May 3 23:22:31 2004 *************** *** 533,535 **** --- 533,536 ---- #include #endif + #include diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'include-orig*' include-orig/winsock2.h include/winsock2.h *** include-orig/winsock2.h Sun Feb 15 09:52:16 2004 --- include/winsock2.h Mon May 3 23:22:31 2004 *************** *** 1216,1218 **** --- 1216,1219 ---- } #endif #endif + #include