From c967c9ec7fee7270496bb2ee7c945e0b1f62f2f8 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Mon, 15 Oct 2012 13:28:29 +0200 Subject: 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 Reviewed-by: Friedemann Kleint --- src/gui/opengl/qopenglfunctions.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/opengl/qopenglfunctions.h') diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 54633ff208..f035e26d81 100644 --- 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 -- cgit v1.2.3