diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-10-19 14:59:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-05-31 15:51:55 +0000 |
| commit | 2d3bbd7f17522df2cb16a5d3b415316daa6953ab (patch) | |
| tree | 9fe6dd6271e39a6fb1453108f3edfd9024c2f083 /examples | |
| parent | c4a21708ed186640f4db381dc800febdbc85941e (diff) | |
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/graphicsview/boxes/glextensions.h | 16 |
1 files changed, 4 insertions, 12 deletions
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 |