diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/opengl | |
parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qglfunctions.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 3989063f96..3d49b3ea3b 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -61,6 +61,11 @@ QT_BEGIN_NAMESPACE typedef ptrdiff_t qgl_GLintptr; 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 # ifdef QGLF_APIENTRY |