From ebd438f69cdd96203dad078182c7a03eccbf4a30b9d9f9f187b513ea38a26661 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 15 Aug 2010 15:08:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win32/mingw32-headers?expand=0&rev=8 --- mingw-w64-headers-1.0b.20100730-c99.patch | 881 ++++++++++++++++++++++ mingw32-headers.spec | 2 + 2 files changed, 883 insertions(+) create mode 100644 mingw-w64-headers-1.0b.20100730-c99.patch diff --git a/mingw-w64-headers-1.0b.20100730-c99.patch b/mingw-w64-headers-1.0b.20100730-c99.patch new file mode 100644 index 0000000..1eb087d --- /dev/null +++ b/mingw-w64-headers-1.0b.20100730-c99.patch @@ -0,0 +1,881 @@ +--- mingw-w64-headers-1.0b.20100730/include/conio.h 2010-05-03 06:14:29.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/conio.h 2010-08-15 16:04:42.000000000 +0200 +@@ -13,19 +13,19 @@ + #endif + + _CRTIMP char *_cgets(char *_Buffer); +- _CRTIMP int __cdecl _cprintf(const char *_Format,...); ++ _CRTIMP int __cdecl _cprintf(const char * __restrict__ _Format,...); + _CRTIMP int __cdecl _cputs(const char *_Str); +- _CRTIMP int __cdecl _cscanf(const char *_Format,...); +- _CRTIMP int __cdecl _cscanf_l(const char *_Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _cscanf(const char * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _cscanf_l(const char * __restrict__ _Format,_locale_t _Locale,...); + _CRTIMP int __cdecl _getch(void); + _CRTIMP int __cdecl _getche(void); +- _CRTIMP int __cdecl _vcprintf(const char *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _cprintf_p(const char *_Format,...); +- _CRTIMP int __cdecl _vcprintf_p(const char *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _cprintf_l(const char *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _cprintf_p_l(const char *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _vcprintf(const char * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _cprintf_p(const char * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vcprintf_p(const char * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _cprintf_l(const char * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcprintf_l(const char * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _cprintf_p_l(const char * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcprintf_p_l(const char * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); + _CRTIMP int __cdecl _kbhit(void); + + #if defined(_X86_) && !defined(__x86_64) +@@ -57,16 +57,16 @@ + _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); + _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); + _CRTIMP int __cdecl _cputws(const wchar_t *_String); +- _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _cwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); + _CRTIMP wint_t __cdecl _putwch_nolock(wchar_t _WCh); + _CRTIMP wint_t __cdecl _getwch_nolock(void); + _CRTIMP wint_t __cdecl _getwche_nolock(void); +@@ -75,9 +75,9 @@ + + #ifndef NO_OLDNAMES + char *__cdecl cgets(char *_Buffer); +- int __cdecl cprintf(const char *_Format,...); ++ int __cdecl cprintf(const char * __restrict__ _Format,...); + int __cdecl cputs(const char *_Str); +- int __cdecl cscanf(const char *_Format,...); ++ int __cdecl cscanf(const char * __restrict__ _Format,...); + int __cdecl getch(void); + int __cdecl getche(void); + int __cdecl kbhit(void); +--- mingw-w64-headers-1.0b.20100730/include/intrin.h 2010-07-13 11:55:43.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/intrin.h 2010-08-15 16:04:42.000000000 +0200 +@@ -357,7 +357,7 @@ + __MACHINEIA64(__m64 __m64_shrp(__m64,__m64,const int)) + __MACHINECE(_CONST_RETURN void *__cdecl memchr(const void *,int,size_t)) + __MACHINE(int __cdecl memcmp(const void *,const void *,size_t)) +- __MACHINE(void *__cdecl memcpy(void *,const void *,size_t)) ++ __MACHINE(void *__cdecl memcpy(void * __restrict__ ,const void * __restrict__ ,size_t)) + __MACHINE(void *__cdecl memset(void *,int,size_t)) + __MACHINEIA64(void __mf(void)) + __MACHINEIA64(void __mfa(void)) +@@ -413,10 +413,10 @@ + __MACHINEIA64(__MINGW_EXTENSION void __store128_rel(void *,__int64,__int64)) + __MACHINE(char *__cdecl strcat(char *,const char *)) + __MACHINE(int __cdecl strcmp(const char *,const char *)) +- __MACHINE(char *__cdecl strcpy(char *,const char *)) ++ __MACHINE(char *__cdecl strcpy(char * __restrict__ ,const char * __restrict__ )) + __MACHINE(size_t __cdecl strlen(const char *)) + __MACHINECE(int __cdecl strncmp(const char *,const char *,size_t)) +- __MACHINECE(char *__cdecl strncpy(char *,const char *,size_t)) ++ __MACHINECE(char *__cdecl strncpy(char * __restrict__ ,const char * __restrict__ ,size_t)) + __MACHINE(char *__cdecl _strset(char *,int)) + __MACHINE(char *__cdecl strset(char *,int)) + __MACHINEIA64(void __ssm(int)) +@@ -428,12 +428,12 @@ + __MACHINECE(int __trap(int,...)) + __MACHINEI(__MINGW_EXTENSION unsigned __int64 __ull_rshift(unsigned __int64,int)) + __MACHINEIA64(__MINGW_EXTENSION unsigned __int64 __UMULH(unsigned __int64 a,unsigned __int64 b)) +- __MACHINECE(wchar_t *__cdecl wcscat(wchar_t *,const wchar_t *)) ++ __MACHINECE(wchar_t *__cdecl wcscat(wchar_t * __restrict__ ,const wchar_t * __restrict__ )) + __MACHINECE(int __cdecl wcscmp(const wchar_t *,const wchar_t *)) +- __MACHINECE(wchar_t *__cdecl wcscpy(wchar_t *,const wchar_t *)) ++ __MACHINECE(wchar_t *__cdecl wcscpy(wchar_t * __restrict__ ,const wchar_t * __restrict__ )) + __MACHINECE(size_t __cdecl wcslen(const wchar_t *)) + __MACHINECE(int __cdecl wcsncmp(const wchar_t *,const wchar_t *,size_t)) +- __MACHINECE(wchar_t *__cdecl wcsncpy(wchar_t *,const wchar_t *,size_t)) ++ __MACHINECE(wchar_t *__cdecl wcsncpy(wchar_t * __restrict__ ,const wchar_t * __restrict__ ,size_t)) + __MACHINECE(wchar_t *__cdecl _wcsset(wchar_t *,wchar_t)) + __MACHINECE(void _WriteBarrier(void)) + __MACHINESA(void _WriteStatusReg(int,int,int)) +@@ -964,9 +964,9 @@ + __MACHINEIW64(unsigned char _BitScanReverse(unsigned long *Index,unsigned long Mask)) + __MACHINEW64(__MINGW_EXTENSION unsigned char _BitScanForward64(unsigned long *Index,unsigned __int64 Mask)) + __MACHINEW64(__MINGW_EXTENSION unsigned char _BitScanReverse64(unsigned long *Index,unsigned __int64 Mask)) +- __MACHINEIW64(wchar_t *__cdecl wcscat(wchar_t *,const wchar_t *)) ++ __MACHINEIW64(wchar_t *__cdecl wcscat(wchar_t * __restrict__ ,const wchar_t * __restrict__ )) + __MACHINEIW64(int __cdecl wcscmp(const wchar_t *,const wchar_t *)) +- __MACHINEIW64(wchar_t *__cdecl wcscpy(wchar_t *,const wchar_t *)) ++ __MACHINEIW64(wchar_t *__cdecl wcscpy(wchar_t * __restrict__ ,const wchar_t * __restrict__ )) + __MACHINEIW64(size_t __cdecl wcslen(const wchar_t *)) + __MACHINEIW64(_CRTIMP wchar_t *__cdecl _wcsset(wchar_t *,wchar_t)) + __MACHINEW64(__MINGW_EXTENSION unsigned __int64 __shiftleft128(unsigned __int64 LowPart,unsigned __int64 HighPart,unsigned char Shift)) +--- mingw-w64-headers-1.0b.20100730/include/memory.h 2010-05-03 06:14:29.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/memory.h 2010-08-15 16:04:42.000000000 +0200 +@@ -25,7 +25,7 @@ + _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); + _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); + int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); +- void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); ++ void *__cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size); + void *__cdecl memset(void *_Dst,int _Val,size_t _Size); + + #ifndef NO_OLDNAMES +--- mingw-w64-headers-1.0b.20100730/include/stdio.h 2010-07-23 14:02:19.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/stdio.h 2010-08-15 16:31:24.000000000 +0200 +@@ -174,23 +174,23 @@ + int __cdecl fflush(FILE *_File); + int __cdecl fgetc(FILE *_File); + _CRTIMP int __cdecl _fgetchar(void); +- int __cdecl fgetpos(FILE *_File ,fpos_t *_Pos); + char *__cdecl fgets(char *_Buf,int _MaxCount,FILE *_File); ++ char *__cdecl fgets(char * __restrict__ _Buf,int _MaxCount,FILE * __restrict__ _File); + _CRTIMP int __cdecl _fileno(FILE *_File); + #ifdef _POSIX_ + int __cdecl fileno(FILE *_File); + #endif + _CRTIMP char *__cdecl _tempnam(const char *_DirName,const char *_FilePrefix); + _CRTIMP int __cdecl _flushall(void); +- FILE *__cdecl fopen(const char *_Filename,const char *_Mode); +- FILE *fopen64(const char *filename,const char *mode); +- int __cdecl fprintf(FILE *_File,const char *_Format,...); ++ FILE *__cdecl fopen(const char * __restrict__ _Filename,const char * __restrict__ _Mode); ++ FILE *fopen64(const char * __restrict__ filename,const char * __restrict__ mode); ++ int __cdecl fprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); + int __cdecl fputc(int _Ch,FILE *_File); + _CRTIMP int __cdecl _fputchar(int _Ch); +- int __cdecl fputs(const char *_Str,FILE *_File); +- size_t __cdecl fread(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); +- FILE *__cdecl freopen(const char *_Filename,const char *_Mode,FILE *_File); +- int __cdecl fscanf(FILE *_File,const char *_Format,...); ++ int __cdecl fputs(const char * __restrict__ _Str,FILE * __restrict__ _File); ++ size_t __cdecl fread(void * __restrict__ _DstBuf,size_t _ElementSize,size_t _Count,FILE * __restrict__ _File); ++ FILE *__cdecl freopen(const char * __restrict__ _Filename,const char * __restrict__ _Mode,FILE * __restrict__ _File); ++ int __cdecl fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); + int __cdecl fsetpos(FILE *_File,const fpos_t *_Pos); + int __cdecl fseek(FILE *_File,long _Offset,int _Origin); + int fseeko64(FILE* stream, _off64_t offset, int whence); +@@ -198,7 +198,7 @@ + _off64_t ftello64(FILE * stream); + __MINGW_EXTENSION int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); + __MINGW_EXTENSION __int64 __cdecl _ftelli64(FILE *_File); +- size_t __cdecl fwrite(const void *_Str,size_t _Size,size_t _Count,FILE *_File); ++ size_t __cdecl fwrite(const void * __restrict__ _Str,size_t _Size,size_t _Count,FILE * __restrict__ _File); + int __cdecl getc(FILE *_File); + int __cdecl getchar(void); + _CRTIMP int __cdecl _getmaxstdio(void); +@@ -214,7 +214,7 @@ + #define popen _popen + #define pclose _pclose + #endif +- int __cdecl printf(const char *_Format,...); ++ int __cdecl printf(const char * __restrict__ _Format,...); + int __cdecl putc(int _Ch,FILE *_File); + int __cdecl putchar(int _Ch); + int __cdecl puts(const char *_Str); +@@ -230,8 +230,8 @@ + #endif + void __cdecl rewind(FILE *_File); + _CRTIMP int __cdecl _rmtmp(void); +- int __cdecl scanf(const char *_Format,...); +- void __cdecl setbuf(FILE *_File,char *_Buffer); ++ int __cdecl scanf(const char * __restrict__ _Format,...); ++ void __cdecl setbuf(FILE * __restrict__ _File,char * __restrict__ _Buffer); + _CRTIMP int __cdecl _setmaxstdio(int _Max); + _CRTIMP unsigned int __cdecl _set_output_format(unsigned int _Format); + _CRTIMP unsigned int __cdecl _get_output_format(void); +@@ -241,46 +241,46 @@ + #define _set_output_format __mingw_set_output_format + #define _get_output_format __mingw_get_output_format + #endif +- int __cdecl setvbuf(FILE *_File,char *_Buf,int _Mode,size_t _Size); +- _CRTIMP int __cdecl _scprintf(const char *_Format,...); +- int __cdecl sscanf(const char *_Src,const char *_Format,...); +- _CRTIMP int __cdecl _snscanf(const char *_Src,size_t _MaxCount,const char *_Format,...); ++ int __cdecl setvbuf(FILE * __restrict__ _File,char * __restrict__ _Buf,int _Mode,size_t _Size); ++ _CRTIMP int __cdecl _scprintf(const char * __restrict__ _Format,...); ++ int __cdecl sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _snscanf(const char * __restrict__ _Src,size_t _MaxCount,const char * __restrict__ _Format,...); + FILE *__cdecl tmpfile(void); + char *__cdecl tmpnam(char *_Buffer); + int __cdecl ungetc(int _Ch,FILE *_File); +- int __cdecl vfprintf(FILE *_File,const char *_Format,va_list _ArgList); +- int __cdecl vprintf(const char *_Format,va_list _ArgList); ++ int __cdecl vfprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,va_list _ArgList); ++ int __cdecl vprintf(const char * __restrict__ _Format,va_list _ArgList); + /* Make sure macros are not defined. */ + extern + __attribute__((__format__ (gnu_printf, 3, 0))) + __attribute__((__nonnull__ (3))) +- int __cdecl __mingw_vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format, ++ int __cdecl __mingw_vsnprintf(char * __restrict__ _DstBuf,size_t _MaxCount,const char * __restrict__ _Format, + va_list _ArgList); + extern + __attribute__((__format__ (gnu_printf, 3, 4))) __attribute__((__nonnull__ (3))) +- int __cdecl __mingw_snprintf(char* s, size_t n, const char* format, ...); ++ int __cdecl __mingw_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); + extern + __attribute__((__format__ (gnu_printf, 1, 2))) __attribute__((__nonnull__ (1))) +- int __cdecl __mingw_printf( const char *, ... ) __MINGW_NOTHROW; ++ int __cdecl __mingw_printf(const char * __restrict__ , ... ) __MINGW_NOTHROW; + extern + __attribute__((__format__ (gnu_printf, 1, 0))) __attribute__((__nonnull__ (1))) +- int __cdecl __mingw_vprintf (const char *, va_list) __MINGW_NOTHROW; ++ int __cdecl __mingw_vprintf (const char * __restrict__ , va_list) __MINGW_NOTHROW; + extern + __attribute__((__format__ (gnu_printf, 2, 3))) __attribute__((__nonnull__ (2))) +- int __cdecl __mingw_fprintf (FILE *, const char *, ...) __MINGW_NOTHROW; ++ int __cdecl __mingw_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; + extern + __attribute__((__format__ (gnu_printf, 2, 0))) __attribute__((__nonnull__ (2))) +- int __cdecl __mingw_vfprintf (FILE *, const char *, va_list) __MINGW_NOTHROW; ++ int __cdecl __mingw_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; + extern + __attribute__((__format__ (gnu_printf, 2, 3))) __attribute__((__nonnull__ (2))) +- int __cdecl __mingw_sprintf (char *, const char *, ...) __MINGW_NOTHROW; ++ int __cdecl __mingw_sprintf (char * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; + extern + __attribute__((__format__ (gnu_printf, 2, 0))) __attribute__((__nonnull__ (2))) +- int __cdecl __mingw_vsprintf (char *, const char *, va_list) __MINGW_NOTHROW; +- _CRTIMP int __cdecl _snprintf(char *_Dest,size_t _Count,const char *_Format,...); +- _CRTIMP int __cdecl _vsnprintf(char *_Dest,size_t _Count,const char *_Format,va_list _Args); +- int __cdecl sprintf(char *_Dest,const char *_Format,...); +- int __cdecl vsprintf(char *_Dest,const char *_Format,va_list _Args); ++ int __cdecl __mingw_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; ++ _CRTIMP int __cdecl _snprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,va_list _Args); ++ int __cdecl sprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,...); ++ int __cdecl vsprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,va_list _Args); + + /* this is here to deal with software defining + * vsnprintf as _vsnprintf, eg. libxml2. */ +@@ -288,11 +288,11 @@ + #pragma push_macro("vsnprintf") + # undef snprintf + # undef vsnprintf +- int __cdecl vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); ++ int __cdecl vsnprintf(char * __restrict__ _DstBuf,size_t _MaxCount,const char * __restrict__ _Format,va_list _ArgList); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ +- int __cdecl snprintf(char* s, size_t n, const char* format, ...); ++ int __cdecl snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); + #ifndef __CRT__NO_INLINE +- __CRT_INLINE int __cdecl vsnprintf (char* s, size_t n, const char* format,va_list arg) { ++ __CRT_INLINE int __cdecl vsnprintf (char * __restrict__ s, size_t n, const char * __restrict__ format,va_list arg) { + return _vsnprintf ( s, n, format, arg); + } + #endif /* !__CRT__NO_INLINE */ +@@ -301,11 +301,11 @@ + #pragma pop_macro ("snprintf") + + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ +- int __cdecl vscanf(const char * Format, va_list argp); +- int __cdecl vfscanf (FILE * fp, const char * Format,va_list argp); +- int __cdecl vsscanf (const char * _Str,const char * Format,va_list argp); ++ int __cdecl vscanf(const char * __restrict__ Format, va_list argp); ++ int __cdecl vfscanf (FILE * __restrict__ fp, const char * __restrict__ Format,va_list argp); ++ int __cdecl vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); + #endif +- _CRTIMP int __cdecl _vscprintf(const char *_Format,va_list _ArgList); ++ _CRTIMP int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList); + _CRTIMP int __cdecl _set_printf_count_output(int _Value); + _CRTIMP int __cdecl _get_printf_count_output(void); + +@@ -331,39 +331,42 @@ + wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); + wint_t __cdecl putwchar(wchar_t _Ch); + wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); +- wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); +- int __cdecl fputws(const wchar_t *_Str,FILE *_File); ++ wchar_t *__cdecl fgetws(wchar_t * __restrict__ _Dst,int _SizeInWords,FILE * __restrict__ _File); ++ int __cdecl fputws(const wchar_t * __restrict__ _Str,FILE * __restrict__ _File); + _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); + _CRTIMP int __cdecl _putws(const wchar_t *_Str); +- int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); +- int __cdecl wprintf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); +- int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); +- int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); +- _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); +- _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vswprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); ++ int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); ++ int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...); ++ int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...); ++ _CRTIMP int __cdecl vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); ++ _CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ + #pragma push_macro("snwprintf") + #pragma push_macro("vsnwprintf") + # undef snwprintf + # undef vsnwprintf +- int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); +- int __cdecl vsnwprintf (wchar_t *, size_t, const wchar_t *, va_list); ++ int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); ++ int __cdecl vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list); + #ifndef __CRT__NO_INLINE +- __CRT_INLINE int __cdecl vsnwprintf (wchar_t *s, size_t n, const wchar_t *format, va_list arg) { return _vsnwprintf(s,n,format,arg); } ++ __CRT_INLINE int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) ++ { ++ return _vsnwprintf(s,n,format,arg); ++ } + #endif /* !__CRT__NO_INLINE */ + #pragma pop_macro ("vsnwprintf") + #pragma pop_macro ("snwprintf") +- int __cdecl vwscanf (const wchar_t *, va_list); +- int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); +- int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); ++ int __cdecl vwscanf (const wchar_t * __restrict__ , va_list); ++ int __cdecl vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list); ++ int __cdecl vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list); + #endif /* ! __NO_ISOCEXT */ +- _CRTIMP int __cdecl _swprintf(wchar_t *_Dest,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vswprintf(wchar_t *_Dest,const wchar_t *_Format,va_list _Args); ++ _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); + + + #ifdef _CRT_NON_CONFORMING_SWPRINTFS +@@ -376,14 +379,14 @@ + #endif + + _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); +- _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); +- int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); +- int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); +- int __cdecl wscanf(const wchar_t *_Format,...); ++ _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); ++ int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _snwscanf(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,...); ++ int __cdecl wscanf(const wchar_t * __restrict__ _Format,...); + _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); +- _CRTIMP FILE *__cdecl _wfopen(const wchar_t *_Filename,const wchar_t *_Mode); +- _CRTIMP FILE *__cdecl _wfreopen(const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); ++ _CRTIMP FILE *__cdecl _wfopen(const wchar_t * __restrict__ _Filename,const wchar_t *__restrict__ _Mode); ++ _CRTIMP FILE *__cdecl _wfreopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode,FILE * __restrict__ _OldFile); + #ifndef _CRT_WPERROR_DEFINED + #define _CRT_WPERROR_DEFINED + _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); +@@ -430,12 +433,12 @@ + _CRTIMP void __cdecl _unlock_file(FILE *_File); + _CRTIMP int __cdecl _fclose_nolock(FILE *_File); + _CRTIMP int __cdecl _fflush_nolock(FILE *_File); +- _CRTIMP size_t __cdecl _fread_nolock(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); ++ _CRTIMP size_t __cdecl _fread_nolock(void * __restrict__ _DstBuf,size_t _ElementSize,size_t _Count,FILE * __restrict__ _File); + _CRTIMP int __cdecl _fseek_nolock(FILE *_File,long _Offset,int _Origin); + _CRTIMP long __cdecl _ftell_nolock(FILE *_File); + __MINGW_EXTENSION _CRTIMP int __cdecl _fseeki64_nolock(FILE *_File,__int64 _Offset,int _Origin); + __MINGW_EXTENSION _CRTIMP __int64 __cdecl _ftelli64_nolock(FILE *_File); +- _CRTIMP size_t __cdecl _fwrite_nolock(const void *_DstBuf,size_t _Size,size_t _Count,FILE *_File); ++ _CRTIMP size_t __cdecl _fwrite_nolock(const void * __restrict__ _DstBuf,size_t _Size,size_t _Count,FILE * __restrict__ _File); + _CRTIMP int __cdecl _ungetc_nolock(int _Ch,FILE *_File); + + #if !defined(NO_OLDNAMES) || !defined(_POSIX) +--- mingw-w64-headers-1.0b.20100730/include/stdlib.h 2010-07-15 15:27:41.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/stdlib.h 2010-08-15 16:34:35.000000000 +0200 +@@ -369,25 +369,25 @@ + _CRTIMP size_t __cdecl _mbstrlen_l(const char *_Str,_locale_t _Locale); + _CRTIMP size_t __cdecl _mbstrnlen(const char *_Str,size_t _MaxCount); + _CRTIMP size_t __cdecl _mbstrnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); +- int __cdecl mbtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes); +- _CRTIMP int __cdecl _mbtowc_l(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes,_locale_t _Locale); +- size_t __cdecl mbstowcs(wchar_t *_Dest,const char *_Source,size_t _MaxCount); +- _CRTIMP size_t __cdecl _mbstowcs_l(wchar_t *_Dest,const char *_Source,size_t _MaxCount,_locale_t _Locale); ++ int __cdecl mbtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SrcSizeInBytes); ++ _CRTIMP int __cdecl _mbtowc_l(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SrcSizeInBytes,_locale_t _Locale); ++ size_t __cdecl mbstowcs(wchar_t * __restrict__ _Dest,const char * __restrict__ _Source,size_t _MaxCount); ++ _CRTIMP size_t __cdecl _mbstowcs_l(wchar_t * __restrict__ _Dest,const char * __restrict__ _Source,size_t _MaxCount,_locale_t _Locale); + int __cdecl rand(void); + _CRTIMP int __cdecl _set_error_mode(int _Mode); + void __cdecl srand(unsigned int _Seed); +- double __cdecl strtod(const char *_Str,char **_EndPtr); +- float __cdecl strtof(const char *nptr, char **endptr); +- long double __cdecl strtold(const char *, char **); ++ double __cdecl strtod(const char * __restrict__ _Str,char ** __restrict__ _EndPtr); ++ float __cdecl strtof(const char * __restrict__ nptr, char ** __restrict__ endptr); ++ long double __cdecl strtold(const char * __restrict__ , char ** __restrict__ ); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ + float __cdecl __mingw_strtof (const char * __restrict__, char ** __restrict__); + long double __cdecl __mingw_strtold(const char * __restrict__, char ** __restrict__); + #endif /* __NO_ISOCEXT */ +- _CRTIMP double __cdecl _strtod_l(const char *_Str,char **_EndPtr,_locale_t _Locale); +- long __cdecl strtol(const char *_Str,char **_EndPtr,int _Radix); +- _CRTIMP long __cdecl _strtol_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); +- unsigned long __cdecl strtoul(const char *_Str,char **_EndPtr,int _Radix); +- _CRTIMP unsigned long __cdecl _strtoul_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); ++ _CRTIMP double __cdecl _strtod_l(const char * __restrict__ _Str,char ** __restrict__ _EndPtr,_locale_t _Locale); ++ long __cdecl strtol(const char * __restrict__ _Str,char ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP long __cdecl _strtol_l(const char * __restrict__ _Str,char ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); ++ unsigned long __cdecl strtoul(const char * __restrict__ _Str,char ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP unsigned long __cdecl _strtoul_l(const char * __restrict__ _Str,char ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); + #ifndef _CRT_SYSTEM_DEFINED + #define _CRT_SYSTEM_DEFINED + int __cdecl system(const char *_Command); +@@ -395,8 +395,8 @@ + _CRTIMP char *__cdecl _ultoa(unsigned long _Value,char *_Dest,int _Radix); + int __cdecl wctomb(char *_MbCh,wchar_t _WCh); + _CRTIMP int __cdecl _wctomb_l(char *_MbCh,wchar_t _WCh,_locale_t _Locale); +- size_t __cdecl wcstombs(char *_Dest,const wchar_t *_Source,size_t _MaxCount); +- _CRTIMP size_t __cdecl _wcstombs_l(char *_Dest,const wchar_t *_Source,size_t _MaxCount,_locale_t _Locale); ++ size_t __cdecl wcstombs(char * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _MaxCount); ++ _CRTIMP size_t __cdecl _wcstombs_l(char * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _MaxCount,_locale_t _Locale); + + #ifndef _CRT_ALLOCATION_DEFINED + #define _CRT_ALLOCATION_DEFINED +@@ -429,17 +429,17 @@ + _CRTIMP wchar_t *__cdecl _itow(int _Value,wchar_t *_Dest,int _Radix); + _CRTIMP wchar_t *__cdecl _ltow(long _Value,wchar_t *_Dest,int _Radix); + _CRTIMP wchar_t *__cdecl _ultow(unsigned long _Value,wchar_t *_Dest,int _Radix); +- double __cdecl wcstod(const wchar_t *_Str,wchar_t **_EndPtr); +- float __cdecl wcstof(const wchar_t *nptr, wchar_t **endptr); ++ double __cdecl wcstod(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr); ++ float __cdecl wcstof(const wchar_t * __restrict__ nptr, wchar_t ** __restrict__ endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ + float __cdecl wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__); + long double __cdecl wcstold(const wchar_t * __restrict__, wchar_t ** __restrict__); + #endif /* __NO_ISOCEXT */ +- _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); +- long __cdecl wcstol(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); +- _CRTIMP long __cdecl _wcstol_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); +- unsigned long __cdecl wcstoul(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); +- _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); ++ _CRTIMP double __cdecl _wcstod_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,_locale_t _Locale); ++ long __cdecl wcstol(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP long __cdecl _wcstol_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); ++ unsigned long __cdecl wcstoul(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wgetenv(const wchar_t *_VarName); + #ifndef _CRT_WSYSTEM_DEFINED + #define _CRT_WSYSTEM_DEFINED +--- mingw-w64-headers-1.0b.20100730/include/string.h 2010-05-03 06:14:29.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/string.h 2010-08-15 16:40:32.000000000 +0200 +@@ -38,7 +38,7 @@ + _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); + _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); + int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); +- void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); ++ void *__cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _Size); + void *__cdecl memset(void *_Dst,int _Val,size_t _Size); + #ifndef NO_OLDNAMES + void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); +@@ -46,8 +46,8 @@ + #endif + #endif + char *__cdecl _strset(char *_Str,int _Val); +- char *__cdecl strcpy(char *_Dest,const char *_Source); +- char *__cdecl strcat(char *_Dest,const char *_Source); ++ char *__cdecl strcpy(char * __restrict__ _Dest,const char * __restrict__ _Source); ++ char *__cdecl strcat(char * __restrict__ _Dest,const char * __restrict__ _Source); + int __cdecl strcmp(const char *_Str1,const char *_Str2); + size_t __cdecl strlen(const char *_Str); + #if 0 +@@ -72,22 +72,22 @@ + char *__cdecl strerror(int); + _CRTIMP char *__cdecl _strlwr(char *_String); + char *strlwr_l(char *_String,_locale_t _Locale); +- char *__cdecl strncat(char *_Dest,const char *_Source,size_t _Count); ++ char *__cdecl strncat(char * __restrict__ _Dest,const char * __restrict__ _Source,size_t _Count); + int __cdecl strncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _strnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _strnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); +- char *strncpy(char *_Dest,const char *_Source,size_t _Count); ++ char *strncpy(char * __restrict__ _Dest,const char * __restrict__ _Source,size_t _Count); + _CRTIMP char *__cdecl _strnset(char *_Str,int _Val,size_t _MaxCount); + _CONST_RETURN char *__cdecl strpbrk(const char *_Str,const char *_Control); + _CONST_RETURN char *__cdecl strrchr(const char *_Str,int _Ch); + _CRTIMP char *__cdecl _strrev(char *_Str); + size_t __cdecl strspn(const char *_Str,const char *_Control); + _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); +- char *__cdecl strtok(char *_Str,const char *_Delim); ++ char *__cdecl strtok(char * __restrict__ _Str,const char * __restrict__ _Delim); + _CRTIMP char *__cdecl _strupr(char *_String); + _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); +- size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); +- _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); ++ size_t __cdecl strxfrm(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount); ++ _CRTIMP size_t __cdecl _strxfrm_l(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); + + #ifndef NO_OLDNAMES + char *__cdecl strdup(const char *_Src); +@@ -114,21 +114,21 @@ + #define _WSTRING_DEFINED + + _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); +- wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); ++ wchar_t *__cdecl wcscat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source); + _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); + int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); +- wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); ++ wchar_t *__cdecl wcscpy(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source); + size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); + size_t __cdecl wcslen(const wchar_t *_Str); + size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); +- wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); ++ wchar_t *wcsncat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _Count); + int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); +- wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); ++ wchar_t *wcsncpy(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _Count); + _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); + _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); + size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); + _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); +- wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); ++ wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim); + _CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum); + _CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str); + _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); +@@ -142,8 +142,8 @@ + _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); + _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); +- size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); +- _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); ++ size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); ++ _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); + int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); + _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); +--- mingw-w64-headers-1.0b.20100730/include/time.h 2010-05-26 19:21:09.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/time.h 2010-08-15 16:04:42.000000000 +0200 +@@ -115,8 +115,8 @@ + double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2); + struct tm *__cdecl _gmtime32(const __time32_t *_Time); + struct tm *__cdecl _localtime32(const __time32_t *_Time); +- size_t __cdecl strftime(char *_Buf,size_t _SizeInBytes,const char *_Format,const struct tm *_Tm); +- _CRTIMP size_t __cdecl _strftime_l(char *_Buf,size_t _Max_size,const char *_Format,const struct tm *_Tm,_locale_t _Locale); ++ size_t __cdecl strftime(char * __restrict__ _Buf,size_t _SizeInBytes,const char * __restrict__ _Format,const struct tm * __restrict__ _Tm); ++ _CRTIMP size_t __cdecl _strftime_l(char * __restrict__ _Buf,size_t _Max_size,const char * __restrict__ _Format,const struct tm * __restrict__ _Tm,_locale_t _Locale); + _CRTIMP char *__cdecl _strdate(char *_Buffer); + _CRTIMP char *__cdecl _strtime(char *_Buffer); + __time32_t __cdecl _time32(__time32_t *_Time); +@@ -142,8 +142,8 @@ + #ifndef _WTIME_DEFINED + _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); + wchar_t *__cdecl _wctime32(const __time32_t *_Time); +- size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); +- _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); ++ size_t __cdecl wcsftime(wchar_t * __restrict__ _Buf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,const struct tm * __restrict__ _Tm); ++ _CRTIMP size_t __cdecl _wcsftime_l(wchar_t * __restrict__ _Buf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,const struct tm * __restrict__ _Tm,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); + _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); + _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); +--- mingw-w64-headers-1.0b.20100730/include/wchar.h 2010-07-23 14:02:19.000000000 +0200 ++++ mingw-w64-headers-1.0b.20100730/include/wchar.h 2010-08-15 16:55:53.000000000 +0200 +@@ -510,17 +510,17 @@ + _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); + _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); + _CRTIMP int __cdecl _cputws(const wchar_t *_String); +- _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList); +- +- _CRTIMP int __cdecl _cwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _cwscanf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _cwscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf_p(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vcwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ ++ _CRTIMP int __cdecl _cwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); + wint_t __cdecl _putwch_nolock(wchar_t _WCh); + wint_t __cdecl _getwch_nolock(void); + wint_t __cdecl _getwche_nolock(void); +@@ -549,60 +549,63 @@ + wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); + wint_t __cdecl putwchar(wchar_t _Ch); + wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); +- wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); +- int __cdecl fputws(const wchar_t *_Str,FILE *_File); ++ wchar_t *__cdecl fgetws(wchar_t * __restrict__ _Dst,int _SizeInWords,FILE * __restrict__ _File); ++ int __cdecl fputws(const wchar_t * __restrict__ _Str,FILE * __restrict__ _File); + _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); + _CRTIMP int __cdecl _putws(const wchar_t *_Str); +- int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); +- int __cdecl wprintf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); +- int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); +- int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); +- _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); +- _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vswprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); ++ int __cdecl fwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); ++ int __cdecl wprintf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _scwprintf(const wchar_t * __restrict__ _Format,...); ++ int __cdecl vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ int __cdecl vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...); ++ _CRTIMP int __cdecl vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list); ++ _CRTIMP int __cdecl _swprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vswprintf_c(wchar_t * __restrict__ _DstBuf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _snwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ +- int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); +- int __cdecl vsnwprintf (wchar_t *, size_t, const wchar_t *, va_list); ++ int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...); ++ int __cdecl vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list); + #ifndef __CRT__NO_INLINE +- __CRT_INLINE int __cdecl vsnwprintf (wchar_t *s, size_t n, const wchar_t *format, va_list arg) { return _vsnwprintf(s,n,format,arg); } ++ __CRT_INLINE int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) ++ { ++ return _vsnwprintf(s,n,format,arg); ++ } + #endif /* !__CRT__NO_INLINE */ +- int __cdecl vwscanf (const wchar_t *, va_list); +- int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); +- int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); +-#endif +- _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _vwprintf_p(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _swprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vswprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _scwprintf_p(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vscwprintf_p(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _wprintf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _wprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _vwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _fwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _fwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vfwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _vfwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _swprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _swprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vswprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _vswprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _scwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _scwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vscwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _snwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _vsnwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- _CRTIMP int __cdecl _swprintf(wchar_t *_Dest,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _vswprintf(wchar_t *_Dest,const wchar_t *_Format,va_list _Args); +- _CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...); +- _CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args); ++ int __cdecl vwscanf (const wchar_t * __restrict__ , va_list); ++ int __cdecl vfwscanf (FILE * __restrict__ ,const wchar_t * __restrict__ ,va_list); ++ int __cdecl vswscanf (const wchar_t * __restrict__ ,const wchar_t * __restrict__ ,va_list); ++#endif ++ _CRTIMP int __cdecl _fwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _wprintf_p(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vfwprintf_p(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _vwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _swprintf_p(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vswprintf_p(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _scwprintf_p(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vscwprintf_p(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _wprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _wprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _vwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _fwprintf_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _fwprintf_p_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vfwprintf_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _vfwprintf_p_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _swprintf_c_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _swprintf_p_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vswprintf_c_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _vswprintf_p_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _scwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _scwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vscwprintf_p_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _snwprintf_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vsnwprintf_l(wchar_t * __restrict__ _DstBuf,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ _CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args); ++ _CRTIMP int __cdecl __swprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,...); ++ _CRTIMP int __cdecl __vswprintf_l(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,_locale_t _Plocinfo,va_list _Args); + + #ifdef _CRT_NON_CONFORMING_SWPRINTFS + #ifndef __cplusplus +@@ -614,19 +617,19 @@ + #endif + + _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); +- _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); +- _CRTIMP int __cdecl _vscwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); +- int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _fwscanf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); +- int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); +- _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); +- _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); +- int __cdecl wscanf(const wchar_t *_Format,...); +- _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList); ++ _CRTIMP int __cdecl _vscwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList); ++ int __cdecl fwscanf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _fwscanf_l(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ int __cdecl swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _swscanf_l(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ _CRTIMP int __cdecl _snwscanf(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _snwscanf_l(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,_locale_t _Locale,...); ++ int __cdecl wscanf(const wchar_t * __restrict__ _Format,...); ++ _CRTIMP int __cdecl _wscanf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,...); + _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); +- _CRTIMP FILE *__cdecl _wfopen(const wchar_t *_Filename,const wchar_t *_Mode); +- _CRTIMP FILE *__cdecl _wfreopen(const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); ++ _CRTIMP FILE *__cdecl _wfopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode); ++ _CRTIMP FILE *__cdecl _wfreopen(const wchar_t * __restrict__ _Filename,const wchar_t * __restrict__ _Mode,FILE * __restrict__ _OldFile); + + #ifndef _CRT_WPERROR_DEFINED + #define _CRT_WPERROR_DEFINED +@@ -664,17 +667,17 @@ + _CRTIMP wchar_t *__cdecl _itow(int _Value,wchar_t *_Dest,int _Radix); + _CRTIMP wchar_t *__cdecl _ltow(long _Value,wchar_t *_Dest,int _Radix); + _CRTIMP wchar_t *__cdecl _ultow(unsigned long _Value,wchar_t *_Dest,int _Radix); +- double __cdecl wcstod(const wchar_t *_Str,wchar_t **_EndPtr); +- _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); +- float __cdecl wcstof( const wchar_t *nptr, wchar_t **endptr); ++ double __cdecl wcstod(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr); ++ _CRTIMP double __cdecl _wcstod_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,_locale_t _Locale); ++ float __cdecl wcstof( const wchar_t * __restrict__ nptr, wchar_t ** __restrict__ endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ + float __cdecl wcstof (const wchar_t * __restrict__, wchar_t ** __restrict__); + long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__); + #endif /* __NO_ISOCEXT */ +- long __cdecl wcstol(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); +- _CRTIMP long __cdecl _wcstol_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); +- unsigned long __cdecl wcstoul(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); +- _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); ++ long __cdecl wcstol(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP long __cdecl _wcstol_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); ++ unsigned long __cdecl wcstoul(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix); ++ _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t * __restrict__ _Str,wchar_t ** __restrict__ _EndPtr,int _Radix,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wgetenv(const wchar_t *_VarName); + #ifndef _CRT_WSYSTEM_DEFINED + #define _CRT_WSYSTEM_DEFINED +@@ -715,21 +718,21 @@ + #ifndef _WSTRING_DEFINED + #define _WSTRING_DEFINED + _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); +- wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); ++ wchar_t *__cdecl wcscat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source); + _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); + int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); +- wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); ++ wchar_t *__cdecl wcscpy(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source); + size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); + size_t __cdecl wcslen(const wchar_t *_Str); + size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); +- wchar_t *__cdecl wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); ++ wchar_t *__cdecl wcsncat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _Count); + int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); +- wchar_t *__cdecl wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); ++ wchar_t *__cdecl wcsncpy(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source,size_t _Count); + _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); + _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); + size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); + _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); +- wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); ++ wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim); + _CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum); + _CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str); + _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); +@@ -743,8 +746,8 @@ + _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); + _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); +- size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); +- _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); ++ size_t __cdecl wcsxfrm(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount); ++ _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t * __restrict__ _Dst,const wchar_t * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale); + int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); + _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); +@@ -788,8 +791,8 @@ + + _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); + wchar_t *__cdecl _wctime32(const __time32_t *_Time); +- size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); +- _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); ++ size_t __cdecl wcsftime(wchar_t * __restrict__ _Buf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,const struct tm * __restrict__ _Tm); ++ _CRTIMP size_t __cdecl _wcsftime_l(wchar_t * __restrict__ _Buf,size_t _SizeInWords,const wchar_t * __restrict__ _Format,const struct tm * __restrict__ _Tm,_locale_t _Locale); + _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); + _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); + _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); +@@ -811,27 +814,27 @@ + typedef wchar_t _Wint_t; + + wint_t __cdecl btowc(int); +- size_t __cdecl mbrlen(const char *_Ch,size_t _SizeInBytes,mbstate_t *_State); +- size_t __cdecl mbrtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SizeInBytes,mbstate_t *_State); +- size_t __cdecl mbsrtowcs(wchar_t *_Dest,const char **_PSrc,size_t _Count,mbstate_t *_State); +- size_t __cdecl wcrtomb(char *_Dest,wchar_t _Source,mbstate_t *_State); +- size_t __cdecl wcsrtombs(char *_Dest,const wchar_t **_PSource,size_t _Count,mbstate_t *_State); ++ size_t __cdecl mbrlen(const char * __restrict__ _Ch,size_t _SizeInBytes,mbstate_t * __restrict__ _State); ++ size_t __cdecl mbrtowc(wchar_t * __restrict__ _DstCh,const char * __restrict__ _SrcCh,size_t _SizeInBytes,mbstate_t * __restrict__ _State); ++ size_t __cdecl mbsrtowcs(wchar_t * __restrict__ _Dest,const char ** __restrict__ _PSrc,size_t _Count,mbstate_t * __restrict__ _State); ++ size_t __cdecl wcrtomb(char * __restrict__ _Dest,wchar_t _Source,mbstate_t * __restrict__ _State); ++ size_t __cdecl wcsrtombs(char * __restrict__ _Dest,const wchar_t ** __restrict__ _PSource,size_t _Count,mbstate_t * __restrict__ _State); + int __cdecl wctob(wint_t _WCh); + + #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */ + wchar_t *__cdecl wmemset(wchar_t *s, wchar_t c, size_t n); + _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *s, wchar_t c, size_t n); + int wmemcmp(const wchar_t *s1, const wchar_t *s2,size_t n); +- wchar_t *__cdecl wmemcpy(wchar_t *s1,const wchar_t *s2,size_t n); ++ wchar_t *__cdecl wmemcpy(wchar_t * __restrict__ s1,const wchar_t * __restrict__ s2,size_t n); + wchar_t *__cdecl wmemmove(wchar_t *s1, const wchar_t *s2, size_t n); + int __cdecl fwide(FILE *stream,int mode); + int __cdecl mbsinit(const mbstate_t *ps); +- __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t *nptr,wchar_t **endptr, int base); +- __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t *nptr,wchar_t **endptr, int base); ++ __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); ++ __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t * __restrict__ nptr,wchar_t ** __restrict__ endptr, int base); + #endif /* __NO_ISOCEXT */ + + void *__cdecl memmove(void *_Dst,const void *_Src,size_t _MaxCount); +- void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _MaxCount); ++ void *__cdecl memcpy(void * __restrict__ _Dst,const void * __restrict__ _Src,size_t _MaxCount); + #ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl fwide(FILE *_F,int _M) { (void)_F; return (_M); } + __CRT_INLINE int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || *_P==0); } +@@ -853,7 +856,10 @@ + return (*_S1 < *_S2 ? -1 : +1); + return 0; + } +- __CRT_INLINE wchar_t *__cdecl wmemcpy(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memcpy(_S1,_S2,_N*sizeof(wchar_t)); } ++ __CRT_INLINE wchar_t *__cdecl wmemcpy(wchar_t * __restrict__ _S1,const wchar_t * __restrict__ _S2,size_t _N) ++ { ++ return (wchar_t *) memcpy (_S1,_S2,_N*sizeof(wchar_t)); ++ } + __CRT_INLINE wchar_t *__cdecl wmemmove(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memmove(_S1,_S2,_N*sizeof(wchar_t)); } + __CRT_INLINE wchar_t *__cdecl wmemset(wchar_t *_S,wchar_t _C,size_t _N) { + wchar_t *_Su = _S; diff --git a/mingw32-headers.spec b/mingw32-headers.spec index 6bddbb6..4281bc4 100644 --- a/mingw32-headers.spec +++ b/mingw32-headers.spec @@ -14,6 +14,7 @@ Source1000: %{name}-rpmlintrc Patch0: mingw-w64-headers-1.0b.20100730-winsock.patch Patch1: mingw-w64-headers-sigset_t.patch Patch2: mingw-w64-headers-1.0b.20100730-uow.patch +Patch3: mingw-w64-headers-1.0b.20100730-c99.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,6 +32,7 @@ MinGW Win64 headers. %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 %build ./configure --host=%{_mingw32_target} \