slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix macro redefinition warning

Browse Source 
Don't re-define APIENTRY macros unconditionally on mac.

Change-Id: I894f866da0ec0d6da76a62f01c24739be92d851f
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
This commit is contained in:
Christian Stromme
2016-04-20 01:50:25 +02:00
committed by Yoann Lopes
parent d73812dcb6
commit 80deebcee3
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/multimediawidgets/qpaintervideosurface.cpp
View File

@@ -218,7 +218,6 @@ void QVideoSurfaceGenericPainter::updateColors(int, int, int, int)
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
#ifndef Q_OS_MAC
#ifndef APIENTRYP #ifndef APIENTRYP
# ifdef APIENTRY # ifdef APIENTRY
# define APIENTRYP APIENTRY * # define APIENTRYP APIENTRY *
@@ -227,10 +226,6 @@ void QVideoSurfaceGenericPainter::updateColors(int, int, int, int)
# define APIENTRYP * # define APIENTRYP *
# endif # endif
#endif #endif
#else
# define APIENTRY
# define APIENTRYP *
#endif
#ifndef GL_TEXTURE0 #ifndef GL_TEXTURE0
# define GL_TEXTURE0 0x84C0 # define GL_TEXTURE0 0x84C0