Compile error fixes

This commit is contained in:
baldurk
2014-06-17 18:26:30 +01:00
parent e78f728799
commit 4822322509
3 changed files with 19 additions and 1 deletions
+1 -1
View File
@@ -813,7 +813,7 @@ void WrappedOpenGL::glDebugMessageControl(GLenum source, GLenum type, GLenum sev
bool WrappedOpenGL::Serialise_glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
{
wstring name = name_ ? widen(string(buf, buf+length)) : L"";
wstring name = buf ? widen(string(buf, buf+length)) : L"";
m_pSerialiser->Serialise("Name", name);
+9
View File
@@ -87,6 +87,15 @@ typedef void (*PFNGLXSWAPBUFFERSPROC)(Display *dpy, GLXDrawable drawable);
*/
// don't want these definitions, the only place we'll use these is as parameter/variable names
#ifdef near
#undef near
#endif
#ifdef far
#undef far
#endif
#define HookWrapper0(ret, function) \
typedef ret (*CONCAT(function, _hooktype)) (); \
extern "C" __attribute__ ((visibility ("default"))) \
+9
View File
@@ -84,6 +84,15 @@
*/
// don't want these definitions, the only place we'll use these is as parameter/variable names
#ifdef near
#undef near
#endif
#ifdef far
#undef far
#endif
#define HookWrapper0(ret, function) \
Hook<ret (WINAPI *) ()> CONCAT(function, _hook); \
typedef ret (WINAPI *CONCAT(function, _hooktype)) (); \