diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index e268550d5..cb4934969 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2006-06-25 Chris Sutcliffe + + * Include/_mingw.h: Increment version to 3.10. + * Makefile.in: Ditto. + 2006-06-26 Danny Smith * mingwex/math/tgamma.c (SQTPI): Add braces. @@ -11,6 +16,11 @@ (erfcf): Likewise. * mingwex/math/tgamma.c (SQTPI): Avoid type punning. +2006-06-25 Chris Sutcliffe + + * Include/_mingw.h: Increment version to 3.10. + * Makefile.in: Ditto. + 2006-06-23 Danny Smith * include/sys/time.h (struct timezone): Define. @@ -71,7 +81,7 @@ 2006-05-17 Danny Smith * mingwex/wcrtomb.c (wcrtomb_cp): Test (wc > 255) only if C locale. - Use supplied codepage as arg to WideCharToMultiByte. + Use supplied codepage as arg to WideCharToMultiByte. 2006-02-13 Earnie Boyd @@ -170,7 +180,7 @@ 2005-08-10 Danny Smith - * mthr_stub.c (__mingwthr_key_dtor): Replace assert(0) with + * mthr_stub.c (__mingwthr_key_dtor): Replace assert(0) with a diagnostic, guarded by #ifdef DEBUG. (__mingwthr_remove_key_dtor): Likewise. @@ -377,8 +387,8 @@ clogl.c cpowl.c cprojl.c creall.c csinl.c csinhl.c csqrtl.c ctanl.c ctanhl.c): New files. * mingwex/Makefile.in (COMPLEX_DISTFILES): Adjust. - (COMPLEX_OBJS): Adjust. - * include/complex.h (cabsl, cacosl, cacoshl, cargl, casinf. + (COMPLEX_OBJS): Adjust. + * include/complex.h (cabsl, cacosl, cacoshl, cargl, casinf. casinhl, catanl, catanhl, ccosl, ccoshl, cexpl, cimagl, clogl, cpowl, cprojl, creall, csinl, csinhl, csqrtl, ctanl, ctanhl): Declare. @@ -409,7 +419,7 @@ ctanf.c ctanhf.c): New files. * mingwex/Makefile.in (COMPLEX_DISTFILES): Adjust. (COMPLEX_OBJS): Adjust. - * include/complex.h (cabsf, cacosf, cacoshf, cargf, casinf. + * include/complex.h (cabsf, cacosf, cacoshf, cargf, casinf. casinhf, catanf, catanhf, ccosf, ccoshf, cexpf, cimagf, clogf, cpowf, cprojf, crealf, csinf, csinhf, csqrtf, ctanf, ctanhf): Declare. @@ -473,7 +483,7 @@ 2004-08-24 Steven G. Johnson * mingwex/mingw-aligned-malloc.c: New file. - * mingwex/tst-aligned-malloc.c: New file. + * mingwex/tst-aligned-malloc.c: New file. 2004-08-24 Danny Smith @@ -543,7 +553,7 @@ (__fast_ldexpl): New function. Use in lieu of ldexpl. 2004-07-27 Danny Smith - + * mingwex/math/expl.c (expl): Move body of code to new static function __expl, removing tests for +/-Inf. Extern function expl calls __expl after testing for max, min log thresholds. @@ -602,7 +612,7 @@ 2004-07-19 Danny Smith - * include/time.h (__time64_t): Add missing ';'. + * include/time.h (__time64_t): Add missing ';'. 2004-07-17 Danny Smith @@ -699,7 +709,7 @@ * mingwex/ftello64.c: New file. * mingwex/lseek64.c: New file. * mingwex/Makefile.in (STDIO_DISTFILES): Add fopen64.c, - fseeko.64.c, ftello64.c, lseek64.c. + fseeko.64.c, ftello64.c, lseek64.c. (STDIO_OBJS): Add fopen64.o, fseeko.64.o, ftello64.o, lseek64.o. 2004-04-24 Luke Dunstan @@ -718,7 +728,7 @@ (install): Add loop for INSTDOCS. * strncasecmp.c: Reword copyright and disclaimer. Move Contributors section to CONTRIBUTORS file. Remove RCS tags. - + 2004-04-22 Danny Smith * mingwex/math/lround.c: Rewrite. @@ -1109,7 +1119,7 @@ 2003-07-03 Danny Smith - * mingwex/math/trunc.c (trunc): Provide lvalue for memory input constraint. + * mingwex/math/trunc.c (trunc): Provide lvalue for memory input constraint. * mingwex/math/truncf.c (truncf): Likewise. * mingwex/math/truncl.c (truncl): Likewise. * mingwex/math/modff.c (modff): Likewise. @@ -1121,7 +1131,7 @@ * include/stdlib.h: Add comment about qsort, bsearch in search.h. * test_headers.c: Include search.h. - * moldname.def.in (lfind, lsearch): Add. + * moldname.def.in (lfind, lsearch): Add. 2003-07-03 Danny Smith @@ -1138,7 +1148,7 @@ * include/_mingw.h (__int32, __int16, __int8, small, hyper): Define. Note: Also added to w32api/include/basetyps.h. - * mingwex/math/tgamma.c, tgammaf.c, tgammal.c (small): + * mingwex/math/tgamma.c, tgammaf.c, tgammal.c (small): Rename to Small (case difference). 2003-06-18 Earnie Boyd @@ -1183,7 +1193,7 @@ * include/math.h (fabs) : Remove inline definition. (fabsf): Likewise. - (fabsl): Likewise. + (fabsl): Likewise. 2003-05-06 Earnie Boyd @@ -1223,7 +1233,7 @@ * configure.in (CFLAGS): Add -D__USE_CRTIMP=1 to default values. (W32API_INCLUDE): Set default value. * configure: Regenerate. - + 2003-04-11 Earnie Boyd * configure.in (LIBM_A): Define for cygwin target. @@ -1244,7 +1254,7 @@ * mingwex/wcstoimax.c (wcstoimax): Likewise. * mingwex/wtoll.c (wtoll): Remove unnecessary ';' * mingwex/fesentenv.c: Include float.h. - * mingwex/math/powl.c: Eliminate type punning/strict aliasing + * mingwex/math/powl.c: Eliminate type punning/strict aliasing warning. * mingwex/math/tanhl.c: Eliminate signed/unsigned warning in constants. @@ -1935,7 +1945,7 @@ * include/inttypes.h: Likewise. 2002-05-16 Danny Smith - * include/_mingw.h (__MINGW_IMPORT): Put extern at start + * include/_mingw.h (__MINGW_IMPORT): Put extern at start to avoid warnings. Thanks to: Oscar Fuentes . 2002-05-16 Danny Smith @@ -1963,7 +1973,7 @@ (MINGW_OBJS): Replace CRT_fp8.o with CRT_fp10.o. * include/float.h: Replace standard float.h defines with #include_next to use GCC's defines. Adjust comments - to reflect change. + to reflect change. 2002-04-26 Danny Smith * include/dos.h: Change prefix "__imp_" to "_imp__" for @@ -1984,7 +1994,7 @@ table on DLL_PROCESS_ATTACH, clean it up on DLL_PROCESS_DETACH. (__dll_exit): New function to run atexit-registered functions and flush output buffers on DLL_PROCESS_DETACH or failed - DLL_PROCESS_ATTACH. + DLL_PROCESS_ATTACH. (atexit): Force use of private atexit table via _dllonexit, (_onexit): New function. Force use of private atexit table via _dllonexit, @@ -2022,8 +2032,8 @@ * mingwex/fmaxl.c: New file. * mingwex/fminl.c: New file. * mingwex/fpclassify.c (__fpclassifyf): Split out to ... - * mingwex/fpclassifyf.c: New file. - * mingwex/fpclassifyl.c: New file. + * mingwex/fpclassifyf.c: New file. + * mingwex/fpclassifyl.c: New file. * mingwex/rint.c (rintf): Split out to... * mingwex/rintf.c: New file. * mingwex/rintl.c: New file. @@ -2050,7 +2060,7 @@ truncf.o truncl.o, signbitf.o signbitl.o, fmal.o, log2l.o. * mingwex/snwprintf.c (snwprintf, vsnwprintf): Correct typo. - + 2002-04-23 Danny Smith Make wide char versions of opendir and friends. * include/dirent.h (_wdirent, _WDIR): Define wide versions of @@ -2062,7 +2072,7 @@ structures and functions. * mingwex/dirent.c: Make _UNICODE neutral. * mingwex/wdirent.c: New file to define _UNICODE before - including dirent.c. + including dirent.c. * mingwex/Makefile.in (DISTFILES): Add wdirent.c. (POSIX_OBJS): Add wdirent.o. (wdirent.o): Specify dependency on dirent.c as well as @@ -2150,7 +2160,7 @@ based on target, building gcrt0.o for cygwin -mno-cygwin. * profile/configure: Regenerate. * profile/Makefile.in (CRT0S): Use name from configure. - (gcrt0.o): New rule. + (gcrt0.o): New rule. (ALL_CRT0S): New define, used to cleanup all gcrt?.o's. 2002-04-04 Danny Smith @@ -2179,10 +2189,10 @@ (OPTFLAGS): New define. (ALL_CFLAGS): Add $(OPTFLAGS). (ALL_CXXFLAGS): Same. - (.c.o:): Remove ALL_CXXFLAGS. + (.c.o:): Remove ALL_CXXFLAGS. 2002-03-29 Danny Smith - * include/stdint.h: Add missing newline at eof. + * include/stdint.h: Add missing newline at eof. * include/stdio.h (snprintf): Add prototype. (vsnprintf): Add prototype and inline definition. (snwprintf): Add prototype. @@ -2225,7 +2235,7 @@ (rint, rintf, round, roundf, trunc. truncf, fmax, fmaxf, fmin, fminf, fma, fmaf, log2, log2f): Add prototypes. (copysign, logb, nextafter, scalb): Add prototypes and - inline stubs for underscored versions in msvcrt.dll. + inline stubs for underscored versions in msvcrt.dll. * include/inttypes.h: New file. * include/fenv.h: New file @@ -2374,11 +2384,11 @@ * profile/gmon.c: Define bzero as memset if mingw32. (monstartup): Use it. -2002-01-25 Danny Smith +2002-01-25 Danny Smith * include/tchar.h (_TCHAR): Add missing ;. -2002-01-25 Danny Smith +2002-01-25 Danny Smith * include/tchar.h (_TCHAR): Add typedefs. @@ -2390,7 +2400,7 @@ 2002-01-12 Danny Smith * msvcrt.def: Revert accidental change. - * include/stdlib.h: Ditto. + * include/stdlib.h: Ditto. 2001-12-07 Earnie Boyd @@ -2401,7 +2411,7 @@ * include/strings.h: New File. -2001-12-02 Danny Smith +2001-12-02 Danny Smith Apply patches from: 2001-06-21 Mumit Khan @@ -2411,7 +2421,7 @@ * include/float.h (_FPCLASS* ): Protect against redefinition. 2001-11-29 Wu Yongwei - + * include/_mingw.h,assert.h,conio.h,ctype.h,dir.h,direct.h dirent.h,dos.h,errno.h,excpt.h,fcntl.h,float.h,io.h, limits.h,locale.h,malloc.h,math.h,process.h,setjmp.h, @@ -2419,31 +2429,31 @@ stdlib.h,string.h,tchar.h,time.h,varargs.h,wchar.h, wctype.h,sys/stat.h,sys/timeb.h,sys/types.h,sys/utime.h: Correct spelling of "disclaimed" in comments. - * include/excpt.h: Another spelling correction. + * include/excpt.h: Another spelling correction. 2001-11-08 Robert Collins * include/errno.h: Fix "errno is not a prototype" warning. -2001-11-07 Danny Smith +2001-11-07 Danny Smith - * include/ctype.h (tolower, toupper,_tolower,_toupper): Comment - differences between ANSI and non-ANSI versions. - (_ctype[],_pctype): Declare vars. - (__ISCTYPE): New helper macro using _pctype. - (is* ctype functions): Use __ISCTYPE to define inline versions. + * include/ctype.h (tolower, toupper,_tolower,_toupper): Comment + differences between ANSI and non-ANSI versions. + (_ctype[],_pctype): Declare vars. + (__ISCTYPE): New helper macro using _pctype. + (is* ctype functions): Use __ISCTYPE to define inline versions. (_toupper, _tolower, __isascii, __toascii, __iscsym, __iscsymf): - Inline definitions. - (isw* ctype functions): Inline definitions. - * include/wctype.h (_ctype[],_pctype): Declare vars. - (isw* ctype functions): Inline definitions. + Inline definitions. + (isw* ctype functions): Inline definitions. + * include/wctype.h (_ctype[],_pctype): Declare vars. + (isw* ctype functions): Inline definitions. 2001-11-06 Danny Smith * include/float.h (_clearfp, _statusfp, _fpreset, fpreset, __fpecode): Use __STDC__ prototypes. - + 2001-11-06 Thomas Pfaff @@ -2471,7 +2481,7 @@ 2001-10-30 Danny Smith * include/io.h (_commit): Add declaration. - Thanks to: "stefan" + Thanks to: "stefan" 2001-10-30 Danny Smith @@ -2485,7 +2495,7 @@ * include/stdlib.h (__p__environ, __p__wenviron): Use __STDC__ prototypes. - + 2001-09-19 Earnie Boyd * Makefile.in: Remove the /usr from the install target. @@ -2509,7 +2519,7 @@ 2001-08-29 Danny Smith * include/stdarg.h (va_list): Typedef as __builtin_va_list if - __GNUC__ >= 3. + __GNUC__ >= 3. * include/varargs.h (va_list): Ditto. * include/stdio.h (va_list): Ditto. @@ -2529,13 +2539,13 @@ 2001-06-11 Danny Smith * profile/configure.in: Make msvcrt.dll version default. - * profile/makefile.in: Build both gcrt1.o and gcrt2.o. + * profile/makefile.in: Build both gcrt1.o and gcrt2.o. * provile/configure: Regenerate. 2001-06-11 Mattia Barbon - * include/stdio.h (swscanf): Make first arugument const. - * include/wchar.h (swscanf): Ditto. + * include/stdio.h (swscanf): Make first arugument const. + * include/wchar.h (swscanf): Ditto. * include/tchar.h (_tfopen): New _UNICODE define. (_tgetenv): Ditto. (_tsetlocale): Ditto. @@ -2622,7 +2632,7 @@ Tue Jan 16 09:41:41 2001 Earnie Boyd * include/locale.h: Apply Danny Smith patch 101834 2000-11-23 Danny Smith (LC_MIN) Add definition. - (LC_MAX) ditto. + (LC_MAX) ditto. (_wsetlocale) Add prototype. 2000-11-29 Earnie Boyd @@ -2650,7 +2660,7 @@ Tue Jan 16 09:41:41 2001 Earnie Boyd Add variables and targets to control snapshot distribution. * profile/gmon.h: Add missing #endif for #ifndef. * profile/ChangeLog: Merge entries here and remove. - * profile/Makefile.in: Add variables and targets to control + * profile/Makefile.in: Add variables and targets to control distribution. * README: Add. * TODO: ditto. @@ -2724,9 +2734,9 @@ Mon Apr 10 17:24:28 2000 Christopher Faylor * Snapshot 2000-02-03. - * include/{assert.h, conio.h, ctype.h, direct.h, dirent.h, fcntl.h, - float.h, io.h, locale.h, malloc.h, math.h, process.h, signal.h, - stdio.h, stdlib.h, string.h, time.h, wctype.h, sys/stat.h, + * include/{assert.h, conio.h, ctype.h, direct.h, dirent.h, fcntl.h, + float.h, io.h, locale.h, malloc.h, math.h, process.h, signal.h, + stdio.h, stdlib.h, string.h, time.h, wctype.h, sys/stat.h, sys/timeb.h, sys/utime.h}: Remove parameter names to avoid namespace pollution. @@ -2765,7 +2775,7 @@ Mon Apr 10 17:24:28 2000 Christopher Faylor * moldname-msvcrt.def: Regenerate. Tue Dec 21 02:22:14 1999 Mumit Khan - + * Snapshot 1999-12-21. * include/wctype.h: New file. @@ -2893,11 +2903,11 @@ Sat Aug 7 18:00:00 1999 Mumit Khan * include/stdlib.h (__p___argv): Fix return type. Fri Jul 30 22:07:06 1999 Mumit Khan - + Add UWIN support. * include/errno.h (errno): It's linked in from startup, not imported. * include/stdlib.h (errno): Likewise. - * include/io.h: Guard against conflicting macros and prototypes in + * include/io.h: Guard against conflicting macros and prototypes in system headers. * include/stdlib.h: Likewise. * include/string.h: Likewise. @@ -2931,7 +2941,7 @@ Fri Jul 16 00:46:04 1999 Mumit Khan stdlib.h,string.h,tchar.h,time.h,varargs.h,sys/locking.h, sys/stat.h,sys/timeb.h,sys/types.h,sys/utime.h}: Include and use the macros __DECLSPEC_SUPPORTED and __MINGW_IMPORT. - + * include/stdlib.h (atexit): Fix prototype. Mon Jun 14 18:38:49 1999 Mumit Khan @@ -2950,7 +2960,7 @@ Mon Apr 5 13:49:17 1999 Mumit Khan * crt1.c (_gnu_exception_handler): Acknowledge Jacob Navia's contribution. * Makefile.in (_libm_dummy.o): New target. - (libm.a): Use. + (libm.a): Use. Tue Mar 16 18:15:26 1999 Mumit Khan @@ -2979,7 +2989,7 @@ Tue Feb 9 00:26:05 1999 Mumit Khan (mainCRTStartup): Use. Sun Jan 3 23:52:25 1999 Mumit Khan - + * include/direct.h: Include io.h instead of dir.h * include/dirent.h: Likewise. * include/dos.h: Likewise. @@ -3006,7 +3016,7 @@ Tue Dec 29 15:04:38 1998 Mumit Khan _off_t instead of long for st_size. Thu Sep 10 22:28:49 1998 Mumit Khan - + * include/errno.h (sys_errlist, sys_nerr): Move from here ... * include/stdlib.h: Here. @@ -3025,17 +3035,17 @@ Fri Sep 4 15:09:11 1998 Mumit Khan Thu Sep 3 10:43:29 1998 Mumit Khan * setjmp.h (_JBTYPE, _JBLEN): Define correctly. - (jmpbuf): typedef using above. + (jmpbuf): typedef using above. (setjmp, longjmp): Prototype using jmpbuf. Merge with Colin Peters' 980701 snapshot. I've ignored changes to - obsolescent imported names, ie., from __imp__ to _imp___. + obsolescent imported names, ie., from __imp__ to _imp___. Also ignored empty include/sys/param.h and incorrect include/sys/times.h. * CRTinit.c: New file. - * include/{errno.h,fcntl.h,math.h,process.h} (__MSVCRT__): Use #ifdef + * include/{errno.h,fcntl.h,math.h,process.h} (__MSVCRT__): Use #ifdef instead of #if. * include/io.h (umask): Fix prototype. * include/stdlib.h (OS constants): Replace with Colin's. @@ -3055,7 +3065,7 @@ Thu Jul 30 21:18:49 1998 Mumit Khan From Earnie Boyd: * include/stdio.h (fdopen, _fdopen): Add const. (getw, putw): Declare. - * include/stdlib.h (MAX_{DRIVE,DIR,FNAME,EXT}): Fix. + * include/stdlib.h (MAX_{DRIVE,DIR,FNAME,EXT}): Fix. Sat Jun 13 18:19:41 1998 Mumit Khan @@ -3073,7 +3083,7 @@ Sun Mar 22 19:59:30 1998 Mumit Khan * include/utime.h: remove * include/stdlib.h (__imp__osver_dll, __imp__winver_dll, - __imp__winmajor_dll, __imp__winminor_dll): Apply Jan-Jaap's + __imp__winmajor_dll, __imp__winminor_dll): Apply Jan-Jaap's patches to define these. * include/time.h (CLK_TCK): Renamed from CLK_TICK. (_daylight, _timezone, _tzname, _tzset): Define. @@ -3085,7 +3095,7 @@ Sun Mar 22 19:59:30 1998 Mumit Khan Wed Feb 4 14:16:44 1998 Mumit Khan - * Update to 980128 snapshot from Colin Peters. + * Update to 980128 snapshot from Colin Peters. Sat Dec 6 21:30:35 1997 Mumit Khan @@ -3123,7 +3133,7 @@ Mon Dec 1 16:51:30 1997 Mumit Khan * include/sys/types.h: Likewise. Tue Nov 4 14:51:01 1997 Mumit Khan - + * include/time.h (CLK_TCK): Renamed from CLK_TICK. (CLK_TICK): Delete. * include/stdlib.h (free): Fix prototype to return void, not void*. @@ -3138,9 +3148,9 @@ Tue Nov 4 14:51:01 1997 Mumit Khan Fri Aug 15 18:23:43 1997 Rob Savoye New directory for the minimalist cygwin environment. - - * crtglob.c: New file. Turn on file globbing support. - * crt_noglob.c: New file. Turn off file globbing support. + + * crtglob.c: New file. Turn on file globbing support. + * crt_noglob.c: New file. Turn off file globbing support. * ctype_old.c: New file. Wrappers for functions that don't have an underscore. * dirent.c: New file. Directory routines readdir, opendir, closedir. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 88f1ab0f3..f439df773 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -18,8 +18,8 @@ # This makefile requires GNU make. PACKAGE = mingw-runtime -VERSION = 3.9 -CYGRELEASE = 2 +VERSION = 3.10 +CYGRELEASE = 1 VPATH = @srcdir@ srcdir = @srcdir@ @@ -59,7 +59,7 @@ inst_libdir:=$(libdir) inst_docdir:=$(prefix)/doc/mingw-runtime endif -# The Mingw headers are installed under a subdirectory of +# The Mingw headers are installed under a subdirectory of # $(tooldir)/include when configuring in Cygwin. HEADER_SUBDIR = @HEADER_SUBDIR@ @@ -112,7 +112,7 @@ LD = @LD@ AR_FLAGS = rcv RANLIB = @RANLIB@ DLLTOOL = @DLLTOOL@ -DLLTOOLFLAGS = +DLLTOOLFLAGS = DLLTOOL_FOR_TARGET = $(DLLTOOL) DLLTOOL_FLAGS = --as $(AS_FOR_TARGET) DLLWRAP = @DLLWRAP@ @@ -214,7 +214,7 @@ libm.a: _libm_dummy.o $(AR) rc $@ _libm_dummy.o $(RANLIB) $@ -libmingwthrd.a: crtmt.o mingwthrd.def +libmingwthrd.a: crtmt.o mingwthrd.def $(DLLTOOL) $(DLLTOOL_FLAGS) --dllname $(THREAD_DLL_NAME) \ --def mingwthrd.def --output-lib $@ $(AR) $(ARFLAGS) $@ crtmt.o @@ -243,7 +243,7 @@ $(THREAD_DLL_NAME) mingwthrd.def: $(DLL_OFILES) Makefile $(SUBDIRS) $(DLLTOOL) $(DLL_DLLTOOL_STUFF) $(CC) -Wl,--base-file=mingwthrd.base mingwthrd.exp $(DLL_CC_STUFF) \ -o mingwthrd_dummy.exe - $(DLLTOOL) $(DLL_DLLTOOL_STUFF) + $(DLLTOOL) $(DLL_DLLTOOL_STUFF) $(CC) mingwthrd.exp -o $(THREAD_DLL_NAME) $(DLL_CC_STUFF) rm -f mingwthrd_dummy.exe @@ -332,7 +332,7 @@ clean: distclean: clean @$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS) - -rm -f config.cache config.status config.log + -rm -f config.cache config.status config.log -rm -f Makefile ifdef SNAPDATE @@ -387,7 +387,7 @@ bindist: cd $(distdir); \ $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) * -snapshot: +snapshot: make dist SNAPDATE=$(shell date '+%Y%m%d') info: @@ -453,8 +453,8 @@ crt2.o: crt1.c init.c crtmt.o: crtmt.c crtst.o: crtst.c ctype_old.o: ctype_old.c -dllcrt1.o: dllcrt1.c -dllcrt2.o: dllcrt1.c +dllcrt1.o: dllcrt1.c +dllcrt2.o: dllcrt1.c dllmain.o: dllmain.c main.o: main.c oldnames.o: oldnames.c diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h index 5900a3226..59f4f39b6 100644 --- a/winsup/mingw/include/_mingw.h +++ b/winsup/mingw/include/_mingw.h @@ -1,7 +1,7 @@ /* * _mingw.h * - * Mingw specific macros included by ALL include files. + * Mingw specific macros included by ALL include files. * * This file is part of the Mingw32 package. * @@ -28,23 +28,23 @@ __DECLSPEC_SUPPORTED Defined if dllimport attribute is supported. __MINGW_IMPORT The attribute definition to specify imported - variables/functions. - _CRTIMP As above. For MS compatibility. + variables/functions. + _CRTIMP As above. For MS compatibility. __MINGW32_VERSION Runtime version. __MINGW32_MAJOR_VERSION Runtime major version. __MINGW32_MINOR_VERSION Runtime minor version. __MINGW32_BUILD_DATE Runtime build date. - + Other macros: __int64 define to be long long. Using a typedef doesn't work for "unsigned __int64" - + All headers should include this first, and then use __DECLSPEC_SUPPORTED to choose between the old ``__imp__name'' style or __MINGW_IMPORT style declarations. */ -/* Try to avoid problems with outdated checks for GCC __attribute__ support. */ +/* Try to avoid problems with outdated checks for GCC __attribute__ support. */ #undef __attribute__ #ifndef __GNUC__ @@ -66,7 +66,7 @@ # ifndef _CRTIMP # ifdef __USE_CRTIMP # define _CRTIMP __attribute__ ((dllimport)) -# else +# else # define _CRTIMP # endif # endif @@ -119,8 +119,8 @@ #endif #ifdef __cplusplus -# define __UNUSED_PARAM(x) -#else +# define __UNUSED_PARAM(x) +#else # ifdef __GNUC__ # define __UNUSED_PARAM(x) x __attribute__ ((__unused__)) # else @@ -158,8 +158,8 @@ # define __MSVCRT_VERSION__ 0x0600 #endif -#define __MINGW32_VERSION 3.9 +#define __MINGW32_VERSION 3.10 #define __MINGW32_MAJOR_VERSION 3 -#define __MINGW32_MINOR_VERSION 9 +#define __MINGW32_MINOR_VERSION 10 #endif /* __MINGW_H */