Ensure QOPENGLF_APIENTRY and QGLF_APIENTRY are set correctly.

gl2ext.h only defines GL_APIENTRY and not APIENTRY so we should use
this macro if it is available. Without it, code that uses
QOPENGLF_APIENTRY and QGLF_APIENTRY might experience compile errors
due to the differing signatures.

Task-number: QTBUG-27313
Change-Id: Id79d934825928d9913138edc6e8f1b00edc89a8d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 54633ff..f035e26 100644 (file)
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -83,6 +83,8 @@ typedef ptrdiff_t qopengl_GLsizeiptr;
 
 #if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY)
 #   define QOPENGLF_APIENTRY APIENTRY
+#elif defined(GL_APIENTRY) && !defined(QOPENGLF_APIENTRY)
+#   define QOPENGLF_APIENTRY GL_APIENTRY
 #endif
 
 # ifndef QOPENGLF_APIENTRYP

diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h
index 4318f53..3d49b3e 100644 (file)
--- a/src/opengl/qglfunctions.h
+++ b/src/opengl/qglfunctions.h
@@ -63,6 +63,8 @@ typedef ptrdiff_t qgl_GLsizeiptr;
 
 #if defined(APIENTRY) && !defined(QGLF_APIENTRY)
 #   define QGLF_APIENTRY APIENTRY
+#elif defined(GL_APIENTRY) && !defined(QGLF_APIENTRY)
+#   define QGLF_APIENTRY GL_APIENTRY
 #endif
 
 # ifndef QGLF_APIENTRYP