lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename OS module loading function as it clashes with define on win32

Browse Source
This commit is contained in:
baldurk
2015-08-31 17:12:21 +02:00
parent 32b028e5a6
commit 277b97efb6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/linux/linux_process.cpp
+1 -1
View File
@@ -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;
}
renderdoc/os/os_specific.h
+1 -1
View File
@@ -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();
};
renderdoc/os/win32/win32_process.cpp
+1 -1
View File
@@ -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)