include/internal.h, crt/crtdll.c: merge trivial whitespace differences from trunk git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4295 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index efc571c..6dffeb4 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -2,8 +2,9 @@ Merged from trunk rev. 4284: 2011-07-19 Kai Tietz <kai.tietz@onevision.com> - * mingw_getsp.S: Fix build for unmodified gcc 4.4.x and 4.5.0 series - about longjmp symbol and name decoration. + * mingw_getsp.S: Fix build for unmodified gcc 4.4.x and 4.5.0 about + longjmp symbol and name decoration using the new __MINGW_IMP_LSYMBOL + macro. 2011-07-23 Ozkan Sezer <sezeroz@gmail.com>
diff --git a/mingw-w64-crt/crt/crtdll.c b/mingw-w64-crt/crt/crtdll.c index 0d3c652..5da8b50 100644 --- a/mingw-w64-crt/crt/crtdll.c +++ b/mingw-w64-crt/crt/crtdll.c
@@ -98,14 +98,14 @@ } if (__native_startup_state != __uninitialized) { - _amsg_exit(31); + _amsg_exit (31); } else { __native_startup_state = __initializing; _initterm ((_PVFV *) (void *) __xi_a, (_PVFV *) (void *) __xi_z); - _initterm (__xc_a,__xc_z); + _initterm (__xc_a, __xc_z); __native_startup_state = __initialized; } if (! nested) @@ -125,7 +125,7 @@ { Sleep(1000); } - if(__native_startup_state!=__initialized) + if (__native_startup_state != __initialized) { _amsg_exit (31); }
diff --git a/mingw-w64-crt/include/internal.h b/mingw-w64-crt/include/internal.h index 7f58a3d..727b05f 100644 --- a/mingw-w64-crt/include/internal.h +++ b/mingw-w64-crt/include/internal.h
@@ -155,7 +155,7 @@ #define _GUI_APP 2 typedef enum __enative_startup_state { - __uninitialized, __initializing, __initialized + __uninitialized = 0, __initializing, __initialized } __enative_startup_state; extern volatile __enative_startup_state __native_startup_state;