RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert r130657, "Windows/DynamicLibrary.inc: Clean up ELM_Callback. We may check the decl instead of the versions of individual libraries."

Browse Source 
We may assume the type of 1st argument as PCSTR in PENUMLOADED_MODULES_CALLBACK. PSTR was in the ancient mingw32.

llvm-svn: 262810
This commit is contained in:
NAKAMURA Takumi 2016-03-07 00:13:09 +00:00
parent 2df8497807
commit 6a76c59fc3
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/config-ix.cmake
View File

@ -451,21 +451,6 @@ else()
set(HAVE_DIA_SDK 0) set(HAVE_DIA_SDK 0)
endif( MSVC ) endif( MSVC )
if( PURE_WINDOWS )
CHECK_CXX_SOURCE_COMPILES("
#include <windows.h>
#include <imagehlp.h>
extern \"C\" void foo(PENUMLOADED_MODULES_CALLBACK);
extern \"C\" void foo(BOOL(CALLBACK*)(PCSTR,ULONG_PTR,ULONG,PVOID));
int main(){return 0;}"
HAVE_ELMCB_PCSTR)
if( HAVE_ELMCB_PCSTR )
set(WIN32_ELMCB_PCSTR "PCSTR")
else()
set(WIN32_ELMCB_PCSTR "PSTR")
endif()
endif( PURE_WINDOWS )
# FIXME: Signal handler return type, currently hardcoded to 'void' # FIXME: Signal handler return type, currently hardcoded to 'void'
set(RETSIGTYPE void) set(RETSIGTYPE void)

3
include/llvm/Config/config.h.cmake
View File

@ -555,9 +555,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME #undef TM_IN_SYS_TIME
/* Type of 1st arg on ELM Callback */
#cmakedefine WIN32_ELMCB_PCSTR ${WIN32_ELMCB_PCSTR}
/* Define to `int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#undef pid_t #undef pid_t

2
lib/Support/Windows/DynamicLibrary.inc
View File

@ -45,7 +45,7 @@ static bool loadDebugHelp(void) {
} }
static BOOL CALLBACK static BOOL CALLBACK
ELM_Callback(WIN32_ELMCB_PCSTR ModuleName, DWORD64 ModuleBase, ELM_Callback(PCSTR ModuleName, DWORD64 ModuleBase,
ULONG ModuleSize, PVOID UserContext) { ULONG ModuleSize, PVOID UserContext) {
OpenedHandles->insert((HMODULE)ModuleBase); OpenedHandles->insert((HMODULE)ModuleBase);
return TRUE; return TRUE;

2
lib/Support/Windows/Signals.inc
View File

@ -241,7 +241,7 @@ struct FindModuleData {
}; };
} }
static BOOL CALLBACK findModuleCallback(WIN32_ELMCB_PCSTR ModuleName, static BOOL CALLBACK findModuleCallback(PCSTR ModuleName,
DWORD64 ModuleBase, ULONG ModuleSize, DWORD64 ModuleBase, ULONG ModuleSize,
void *VoidData) { void *VoidData) {
FindModuleData *Data = (FindModuleData*)VoidData; FindModuleData *Data = (FindModuleData*)VoidData;