Change __MINGW to __MINGW32__. Patch submitted by Henrik Bach.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20243 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Config/alloca.h b/include/llvm/Config/alloca.h
index 13631e5a7050fa989d970455e01f31d43b10cbb8..0756db4785b72f6d060cdc5b990d3da15ae095c6 100644 (file)
--- a/include/llvm/Config/alloca.h
+++ b/include/llvm/Config/alloca.h
@@ -28,7 +28,7 @@
 #define alloca _alloca
 #elif defined(HAVE_ALLOCA_H)
 #include <alloca.h>
-#elif defined(__MINGW) && defined(HAVE_MALLOC_H)
+#elif defined(__MINGW32__) && defined(HAVE_MALLOC_H)
 #include <malloc.h>
 #elif !defined(__GNUC__)
 #      ifdef _AIX

diff --git a/lib/System/Win32/DynamicLibrary.inc b/lib/System/Win32/DynamicLibrary.inc
index af28f756254f7f9addbfe720f1b7ec7e016c244a..2209e592091d8b313ebdcd96ffb05343e33bc173 100644 (file)
--- a/lib/System/Win32/DynamicLibrary.inc
+++ b/lib/System/Win32/DynamicLibrary.inc
@@ -13,7 +13,7 @@
 
 #include "Win32.h"
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 #include <imagehlp.h>
 #else
 #include <dbghelp.h>

diff --git a/lib/System/Win32/Process.inc b/lib/System/Win32/Process.inc
index 7c8de64473226a0d12516125fa37a07b23e60b4d..a47ff2e39bfce4fefb796a8a92684e1a94e34c8f 100644 (file)
--- a/lib/System/Win32/Process.inc
+++ b/lib/System/Win32/Process.inc
@@ -23,7 +23,7 @@
 //===          and must not be UNIX code
 //===----------------------------------------------------------------------===//
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 // This ban should be lifted when MinGW 1.0+ has defined this value.
 #  define _HEAPOK (-2)
 #endif

diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index afe6c8dfa643309ff324493288c26a4f45431648..55e2d2d6a5c683de61c28776798a4ef148989046 100644 (file)
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <vector>
 
-#ifdef __MINGW
+#ifdef __MINGW32__
 #include <imagehlp.h>
 #else
 #include <dbghelp.h>

diff --git a/lib/System/Win32/TimeValue.inc b/lib/System/Win32/TimeValue.inc
index 34a5df18ef33f23c1a308580436729ea1441c115..01f74848b800455f928eb8c300319c7b7fb20683 100644 (file)
--- a/lib/System/Win32/TimeValue.inc
+++ b/lib/System/Win32/TimeValue.inc
@@ -31,7 +31,7 @@ TimeValue TimeValue::now() {
 }
 
 std::string TimeValue::toString() const {
-#ifdef __MINGW
+#ifdef __MINGW32__
   // This ban may be lifted by either:
   // (i) a future MinGW version other than 1.0 inherents the __time64_t type, or
   // (ii) configure tests for either the time_t or __time64_t type.