Update for mingw-w64 3.1.0

D-Programming-GDC · Jun 12, 2014 · d9b10c4 · d9b10c4
1 parent d8871e4
commit d9b10c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/gcc/d/dfrontend/port.h b/gcc/d/dfrontend/port.h
@@ -26,6 +26,12 @@ typedef unsigned long long ulonglong;
 
 typedef unsigned char utf8_t;
 
+// MinGWs stdlib.h defines strtod to __strtod.
+// Depending on whether this header is included our function name changes...
+#ifdef strtod
+    #undef strtod
+#endif
+
 struct Port
 {
     static longdouble ldbl_nan;

diff --git a/libphobos/libdruntime/core/sys/windows/windows.d b/libphobos/libdruntime/core/sys/windows/windows.d
@@ -1587,17 +1587,20 @@ export BOOL SwitchToThread();
 
 version (MinGW)
 {
-    version (X86_64)
-        version = MinGW64RT;
-}
-
-version (MinGW64RT)
-{
-    LONG InterlockedIncrement(LPLONG lpAddend);
-    LONG InterlockedDecrement(LPLONG lpAddend);
-    LONG InterlockedExchange(LPLONG Target, LONG Value);
-    LONG InterlockedExchangeAdd(LPLONG Addend, LONG Value);
-    LONG InterlockedCompareExchange(LONG *Destination, LONG Exchange, LONG Comperand);
+    extern(C)
+    {
+        LONG _InterlockedIncrement(LPLONG lpAddend);
+        LONG _InterlockedDecrement(LPLONG lpAddend);
+        LONG _InterlockedExchange(LPLONG Target, LONG Value);
+        LONG _InterlockedExchangeAdd(LPLONG Addend, LONG Value);
+        LONG _InterlockedCompareExchange(LONG *Destination, LONG Exchange, LONG Comperand);
+
+        alias InterlockedIncrement =  _InterlockedIncrement;
+        alias InterlockedDecrement = _InterlockedDecrement;
+        alias InterlockedExchange = _InterlockedExchange;
+        alias InterlockedExchangeAdd = _InterlockedExchangeAdd;
+        alias InterlockedCompareExchange = _InterlockedCompareExchange;
+    }
 
     void InitializeCriticalSection(CRITICAL_SECTION * lpCriticalSection);
     void EnterCriticalSection(CRITICAL_SECTION * lpCriticalSection);