diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 14:18:32 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 14:18:32 +0000 |
| commit | 5d26bf6d9d31e803e3be6a34b9d8474ecc152929 (patch) | |
| tree | da7f9c9a07a08348489d3d694c3372417b1ac012 /Source/Core/DolphinWX/GLInterface/WGL.cpp | |
| parent | bea484e12f98f67eafafeb8db6d3181020fdfb46 (diff) | |
Rename our GLInterface class function 'GetProcAddress' in order to not have clashing function names due to Windows.
Diffstat (limited to 'Source/Core/DolphinWX/GLInterface/WGL.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/GLInterface/WGL.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp index afc67da431..74c6956371 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -31,7 +31,7 @@ void cInterfaceWGL::Swap() SwapBuffers(hDC); } -void* cInterfaceWGL::GetProcAddress(std::string name) +void* cInterfaceWGL::GetFuncAddress(std::string name) { void* func = (void*)wglGetProcAddress((LPCSTR)name.c_str()); if (func == NULL) @@ -83,7 +83,7 @@ bool cInterfaceWGL::Create(void *&window_handle) Host_SysMessage("failed to create window"); return false; } - wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)GLInterface->GetProcAddress("wglSwapIntervalEXT"); + wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)GLInterface->GetFuncAddress("wglSwapIntervalEXT"); // Show the window EmuWindow::Show(); |