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 | ad1b453b24c8079a4a247f37364c158c9b53c7a9 (patch) | |
| tree | 1356c9e7573c64a34fb26804363bbc9d0b765957 /lib | |
| parent | 4203b7116a807d0c4dabcb403664f0cca0a7f9f7 (diff) | |
| download | llvm-ad1b453b24c8079a4a247f37364c158c9b53c7a9.tar.gz llvm-ad1b453b24c8079a4a247f37364c158c9b53c7a9.tar.bz2 llvm-ad1b453b24c8079a4a247f37364c158c9b53c7a9.tar.xz | |
Windows/DynamicLibrary.inc: ELM_Callback fix for mingw-w64.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125169 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Support/Windows/DynamicLibrary.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/Support/Windows/DynamicLibrary.inc b/lib/Support/Windows/DynamicLibrary.inc index 5f44e63c78..2c14366c07 100644 --- a/lib/Support/Windows/DynamicLibrary.inc +++ b/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, |