From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 20 Jul 2010 12:10:10 +0000 (+0000)
Subject: [MINGW-W64]
X-Git-Tag: backups/Ash_Shell@48412~1^2~168
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5be505d1b40adebbcb9836674370e9e2352a30d4;ds=sidebyside

[MINGW-W64]
- Define WIN32_LEAN_AND_MEAN.
- Include stdlib.h for _winmajor.

svn path=/trunk/; revision=48131
---

diff --git a/reactos/lib/3rdparty/mingw/tlssup.c b/reactos/lib/3rdparty/mingw/tlssup.c
index 8153fb6f2bf..1c32d0d62a6 100644
--- a/reactos/lib/3rdparty/mingw/tlssup.c
+++ b/reactos/lib/3rdparty/mingw/tlssup.c
@@ -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 @@ _CRTALLOC(".CRT$XLD") PIMAGE_TLS_CALLBACK __xl_d = (PIMAGE_TLS_CALLBACK) __dyn_t
 
 
 int mingw_initltsdrot_force = 0;
-int mingw_initltsdyn_force=0;
+int mingw_initltsdyn_force = 0;
 int mingw_initltssuo_force = 0;