diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-02-09 04:18:12 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-02-09 04:18:12 +0000 |
| commit | 684ef5e7bd45df038e08131f8dff07efa1667208 (patch) | |
| tree | c1171f55c482402c14c6388f8319f9513d05ba22 /llvm | |
| parent | cbf582921e0073f9d17bd83e3db6539d62140819 (diff) | |
| download | bcm5719-llvm-684ef5e7bd45df038e08131f8dff07efa1667208.tar.gz bcm5719-llvm-684ef5e7bd45df038e08131f8dff07efa1667208.zip | |
Windows/DynamicLibrary.inc: ELM_Callback fix for mingw-w64.
llvm-svn: 125169
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index 5f44e63c781..2c14366c076 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/lib/Support/Windows/DynamicLibrary.inc @@ -55,7 +55,17 @@ extern "C" { // Use new callback if: // - Newer Visual Studio (comes with newer SDK). // - Visual Studio 2005 with Windows SDK 6.0+ -#if !defined(_MSC_VER) || _MSC_VER < 1500 && (!defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 6000) +#if defined(_MSC_VER) + #if _MSC_VER < 1500 && (!defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 6000) + #define OLD_ELM_CALLBACK_DECL 1 + #endif +#elif defined(__MINGW64__) + // Use new callback. +#elif defined(__MINGW32__) + #define OLD_ELM_CALLBACK_DECL 1 +#endif + +#ifdef OLD_ELM_CALLBACK_DECL static BOOL CALLBACK ELM_Callback(PSTR ModuleName, ModuleBaseType ModuleBase, ULONG ModuleSize, |
