diff options
| author | Christian Stromme <christian.stromme@theqtcompany.com> | 2016-04-20 01:50:25 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-04-27 10:54:41 +0000 |
| commit | 80deebcee3e9b14046a042cf6a66467ff078d57b (patch) | |
| tree | 67cbe00ed3285e344b75ffe3efa4251366dbd8e8 /src/multimediawidgets | |
| parent | d73812dcb699bd6b6bd99b4fee3b50573d1e7e5e (diff) | |
Fix macro redefinition warning
Don't re-define APIENTRY macros unconditionally on mac.
Change-Id: I894f866da0ec0d6da76a62f01c24739be92d851f
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 5a8857b78..affcacec7 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -218,18 +218,13 @@ void QVideoSurfaceGenericPainter::updateColors(int, int, int, int) #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) -#ifndef Q_OS_MAC -# ifndef APIENTRYP -# ifdef APIENTRY -# define APIENTRYP APIENTRY * -# else -# define APIENTRY -# define APIENTRYP * -# endif -# endif -#else -# define APIENTRY -# define APIENTRYP * +#ifndef APIENTRYP +# ifdef APIENTRY +# define APIENTRYP APIENTRY * +# else +# define APIENTRY +# define APIENTRYP * +# endif #endif #ifndef GL_TEXTURE0 |