From 2d3bbd7f17522df2cb16a5d3b415316daa6953ab Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 19 Oct 2016 14:59:46 +0200 Subject: glextensions.h: simplify #if-ery to avoid conflict The prior #if-ery was needlessly confusing; and most of it was redundant anyway. Change-Id: I82da1b38c08b93b9dc2220dd7b15ecb7dcc002af Reviewed-by: Friedemann Kleint --- examples/widgets/graphicsview/boxes/glextensions.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'examples/widgets/graphicsview') diff --git a/examples/widgets/graphicsview/boxes/glextensions.h b/examples/widgets/graphicsview/boxes/glextensions.h index 9b1724805d..685700d866 100644 --- a/examples/widgets/graphicsview/boxes/glextensions.h +++ b/examples/widgets/graphicsview/boxes/glextensions.h @@ -78,19 +78,11 @@ glMapBuffer glUnmapBuffer */ -#ifndef Q_OS_MAC -# ifndef APIENTRYP -# ifdef APIENTRY -# undef APIENTRYP -# define APIENTRYP APIENTRY * -# else -# define APIENTRY -# define APIENTRYP * -# endif -# endif -#else +#ifndef APIENTRY # define APIENTRY -# define APIENTRYP * +#endif +#ifndef APIENTRYP +# define APIENTRYP APIENTRY * #endif #ifndef GL_VERSION_1_2 -- cgit v1.2.3