diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-07 00:13:09 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-07 00:13:09 +0000 |
| commit | 2de1b320a4a72a9a60770624beb6f5ff1b71d13c (patch) | |
| tree | 9ac0aa0a951e0ccf2f9837d4869466147a26f194 /llvm/lib/Support | |
| parent | 253ca348b2ea5fbde89377dfbbedab100cef4e7a (diff) | |
| download | bcm5719-llvm-2de1b320a4a72a9a60770624beb6f5ff1b71d13c.tar.gz bcm5719-llvm-2de1b320a4a72a9a60770624beb6f5ff1b71d13c.zip | |
Revert r130657, "Windows/DynamicLibrary.inc: Clean up ELM_Callback. We may check the decl instead of the versions of individual libraries."
We may assume the type of 1st argument as PCSTR in PENUMLOADED_MODULES_CALLBACK. PSTR was in the ancient mingw32.
llvm-svn: 262810
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Signals.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index 17418b015c7..050689483de 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/lib/Support/Windows/DynamicLibrary.inc @@ -45,7 +45,7 @@ static bool loadDebugHelp(void) { } static BOOL CALLBACK -ELM_Callback(WIN32_ELMCB_PCSTR ModuleName, DWORD64 ModuleBase, +ELM_Callback(PCSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext) { OpenedHandles->insert((HMODULE)ModuleBase); return TRUE; diff --git a/llvm/lib/Support/Windows/Signals.inc b/llvm/lib/Support/Windows/Signals.inc index f40ca72996a..552bbff5b0c 100644 --- a/llvm/lib/Support/Windows/Signals.inc +++ b/llvm/lib/Support/Windows/Signals.inc @@ -241,7 +241,7 @@ struct FindModuleData { }; } -static BOOL CALLBACK findModuleCallback(WIN32_ELMCB_PCSTR ModuleName, +static BOOL CALLBACK findModuleCallback(PCSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, void *VoidData) { FindModuleData *Data = (FindModuleData*)VoidData; |
