summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/opengl
diff options
context:
space:
mode:
author Peter Ferrie <peter.ferrie@gmail.com>2015-03-15 21:06:36 -0700
committer Peter Ferrie <peter.ferrie@gmail.com>2015-03-15 21:06:36 -0700
commit366a5b7272b828f1273f371e2647982f68bd921f (patch)
treebdd659bac9b7bfb5ebd343b3b074e0a00e1c6909 /src/osd/modules/opengl
parentb685e5264ead9ed98ff8c7d2dafa038618fb957c (diff)
osd_opengl.h: fix compile on MSVC 2012 (nw)
Diffstat (limited to 'src/osd/modules/opengl')
-rw-r--r--src/osd/modules/opengl/osd_opengl.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 94eab4e145b..3e9adbb010c 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -89,16 +89,25 @@
#define OSD_GL(ret,func,params) ret (APIENTRY *func) params;
#define OSD_GL_UNUSED(ret,func,params)
- struct osd_gl_dispatch
+#ifdef _MSC_VER
+ extern "C" {
+#else
{
- #define GET_GLFUNC 1
- #include "osd_opengl.h"
- #undef GET_GLFUNC
- };
+#endif
+ struct osd_gl_dispatch
+ {
+ #define GET_GLFUNC 1
+ #include "osd_opengl.h"
+ #undef GET_GLFUNC
+ };
+ }
#undef OSD_GL
#undef OSD_GL_UNUSED
+#ifdef _MSC_VER
+ extern "C" osd_gl_dispatch *gl_dispatch;
+#endif
extern osd_gl_dispatch *gl_dispatch;
/*