From 25c90050974714b5582df5ef9609be4efe4e771a Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Fri, 1 Feb 2013 13:20:19 +0000
Subject: OpenGL: Refactor some defines and typedefs to a common location
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These will be needed by the upcoming OpenGL enablers so move them
out of qopenglfunctions.h to somewhere that any opengl related file can
access them.

Change-Id: I0c788559397d446ec7210e2ad940da862179710d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/gui/opengl/qopengl.h          | 17 +++++++++++++++++
 src/gui/opengl/qopenglfunctions.h | 21 ---------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index a4a626a0c4..e1d36662d1 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -108,6 +108,23 @@ typedef GLfloat GLdouble;
 
 QT_BEGIN_NAMESPACE
 
+// Types that aren't defined in all system's gl.h files.
+typedef ptrdiff_t qopengl_GLintptr;
+typedef ptrdiff_t qopengl_GLsizeiptr;
+
+
+#if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY)
+#   define QOPENGLF_APIENTRY APIENTRY
+#endif
+
+# ifndef QOPENGLF_APIENTRYP
+#   ifdef QOPENGLF_APIENTRY
+#     define QOPENGLF_APIENTRYP QOPENGLF_APIENTRY *
+#   else
+#     define QOPENGLF_APIENTRY
+#     define QOPENGLF_APIENTRYP *
+#   endif
+# endif
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 100e3751be..7d88f8b08b 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -73,27 +73,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-// Types that aren't defined in all system's gl.h files.
-typedef ptrdiff_t qopengl_GLintptr;
-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
-#   ifdef QOPENGLF_APIENTRY
-#     define QOPENGLF_APIENTRYP QOPENGLF_APIENTRY *
-#   else
-#     define QOPENGLF_APIENTRY
-#     define QOPENGLF_APIENTRYP *
-#   endif
-# endif
-
 struct QOpenGLFunctionsPrivate;
 
 // Undefine any macros from GLEW, qopenglextensions_p.h, etc that
-- 
cgit v1.2.3