[ros-diffs] [akhaldi] 48131: [MINGW-W64] - Define WIN32_LEAN_AND_MEAN. - Include stdlib.h for _winmajor.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Tue Jul 20 12:10:11 UTC 2010


Author: akhaldi
Date: Tue Jul 20 12:10:10 2010
New Revision: 48131

URL: http://svn.reactos.org/svn/reactos?rev=48131&view=rev
Log:
[MINGW-W64]
- Define WIN32_LEAN_AND_MEAN.
- Include stdlib.h for _winmajor.

Modified:
    trunk/reactos/lib/3rdparty/mingw/tlssup.c

Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.c?rev=48131&r1=48130&r2=48131&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Tue Jul 20 12:10:10 2010
@@ -12,17 +12,23 @@
 
 #include <sect_attribs.h>
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 #include <stdio.h>
 #include <memory.h>
 #include <malloc.h>
+#ifndef _WIN64
+#include <stdlib.h> /* for _winmajor */
+#endif
 
 #ifndef __INTERNAL_FUNC_DEFINED
 #define __INTERNAL_FUNC_DEFINED
-  typedef void (__cdecl *_PVFV)(void);
-  typedef int (__cdecl *_PIFV)(void);
-  typedef void (__cdecl *_PVFI)(int);
+typedef void (__cdecl *_PVFV)(void);
+typedef int (__cdecl *_PIFV)(void);
+typedef void (__cdecl *_PVFI)(int);
 #endif
 
 extern WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved);
@@ -208,5 +214,5 @@
 
 
 int mingw_initltsdrot_force = 0;
-int mingw_initltsdyn_force=0;
+int mingw_initltsdyn_force = 0;
 int mingw_initltssuo_force = 0;




More information about the Ros-diffs mailing list