[ros-diffs] [tkreuzer] 48241: [MINGW] Add a temporary hack to fix amd64 compilation for some modules.

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sun Jul 25 03:08:53 2010
New Revision: 48241

URL: http://svn.reactos.org/svn/reactos?rev=48241&view=rev
Log:
[MINGW]
Add a temporary hack to fix amd64 compilation for some modules.

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

Modified: trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c?rev=48241&r1=48240&r2=48241&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c [iso-8859-1] Sun Jul 25 03:08:53 2010
@@ -11,3 +11,34 @@
    we do tls cleanup in runtime and _CRT_MT has value 2.  */
 int _CRT_MT = 2;
 
+// HACK around broken imports from libmingwex, until RosBE64 is updated
+#ifdef _M_AMD64
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <stdlib.h>
+
+int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *));
+int __mingwthr_remove_key_dtor (DWORD key);
+
+extern int ___w64_mingwthr_remove_key_dtor (DWORD key);
+extern int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *));
+
+int
+__mingwthr_remove_key_dtor (DWORD key)
+{
+   return ___w64_mingwthr_remove_key_dtor (key);
+}
+
+int
+__mingwthr_key_dtor (DWORD key, void (*dtor)(void *))
+{
+  if (dtor)
+    return ___w64_mingwthr_add_key_dtor (key, dtor);
+
+  return 0;
+}
+#endif
+