From 277b97efb685fc1049dbfebfb932fb45a7b6f286 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 31 Aug 2015 17:12:21 +0200 Subject: [PATCH] Rename OS module loading function as it clashes with define on win32 --- renderdoc/os/linux/linux_process.cpp | 2 +- renderdoc/os/os_specific.h | 2 +- renderdoc/os/win32/win32_process.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/os/linux/linux_process.cpp b/renderdoc/os/linux/linux_process.cpp index af1cb2adc..82ad3138a 100644 --- a/renderdoc/os/linux/linux_process.cpp +++ b/renderdoc/os/linux/linux_process.cpp @@ -396,7 +396,7 @@ void Process::StartGlobalHook(const char *pathmatch, const char *logfile, const RDCUNIMPLEMENTED("Global hooking of all processes on linux"); } -bool Process::LoadLibrary(const char *module) +bool Process::LoadModule(const char *module) { return dlopen(module, RTLD_NOW) != NULL; } diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index 998735822..d3b4da325 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -50,7 +50,7 @@ namespace Process uint32_t LaunchProcess(const char *app, const char *workingDir, const char *cmdLine); uint32_t LaunchAndInjectIntoProcess(const char *app, const char *workingDir, const char *cmdLine, const char *logfile, const CaptureOptions *opts, bool waitForExit); - bool LoadLibrary(const char *module); + bool LoadModule(const char *module); void *GetFunctionAddress(const char *module, const char *function); uint32_t GetCurrentPID(); }; diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index 68db8b7b5..30129fdc3 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -566,7 +566,7 @@ void Process::StartGlobalHook(const char *pathmatch, const char *logfile, const #endif } -bool LoadLibrary(const char *module) +bool Process::LoadModule(const char *module) { HMODULE mod = GetModuleHandleA(module); if(mod != NULL)