cogl: Use APIENTRY for GL function pointer declarations

This matters for platforms such as Windows that use a different
calling covention from the default for GL functions.

diff --git a/clutter/cogl/cogl/driver/gl/cogl-context-driver.h b/clutter/cogl/cogl/driver/gl/cogl-context-driver.h
index 0f8baa7..58f4fe9 100644 (file)
--- a/clutter/cogl/cogl/driver/gl/cogl-context-driver.h
+++ b/clutter/cogl/cogl/driver/gl/cogl-context-driver.h
@@ -26,10 +26,14 @@
 
 #include "cogl.h"
 
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f)
 
 #define COGL_FEATURE_FUNCTION(ret, name, args) \
-  ret (* pf_ ## name) args;
+  ret (APIENTRY * pf_ ## name) args;
 
 #define COGL_FEATURE_END()
 

diff --git a/clutter/cogl/cogl/driver/gles/cogl-context-driver.h b/clutter/cogl/cogl/driver/gles/cogl-context-driver.h
index d200d1f..75960f1 100644 (file)
--- a/clutter/cogl/cogl/driver/gles/cogl-context-driver.h
+++ b/clutter/cogl/cogl/driver/gles/cogl-context-driver.h
@@ -27,10 +27,14 @@
 #include "cogl.h"
 #include "cogl-gles2-wrapper.h"
 
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
 #define COGL_FEATURE_BEGIN(a, b, c, d, e, f)
 
 #define COGL_FEATURE_FUNCTION(ret, name, args) \
-  ret (* pf_ ## name) args;
+  ret (APIENTRY * pf_ ## name) args;
 
 #define COGL_FEATURE_END()