summaryrefslogtreecommitdiff
path: root/include/GL
diff options
context:
space:
mode:
authorMatthew Waters <ystreet00@gmail.com>2012-12-02 22:28:34 +1100
committerBrian Paul <brianp@vmware.com>2012-12-06 09:08:52 -0700
commitac24d172582cdb7a79098ca43ca8870712a98068 (patch)
tree7503a67c2a58559a2daf3a192a7df4644df330bc /include/GL
parent5e99cd915921d7b863a66badf09941f11120c6ab (diff)
mesa: fix compiler warnings when including GL/gl.h with other gl headers
GL/gl.h provides some definitions (GL_FALSE, GL_ONE, etc) that have the same value as other gl headers but are represented differently (0 vs 0x0 and 1 vs 0x1). This causes compiler warnings about redefining such definitions when including GL/gl.h with other gl headers. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=57802 Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'include/GL')
-rw-r--r--include/GL/gl.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index e65e1bc8a8f..97094fc5997 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -169,8 +169,8 @@ typedef double GLclampd; /* double precision float in [0,1] */
*/
/* Boolean values */
-#define GL_FALSE 0x0
-#define GL_TRUE 0x1
+#define GL_FALSE 0
+#define GL_TRUE 1
/* Data types */
#define GL_BYTE 0x1400
@@ -370,8 +370,8 @@ typedef double GLclampd; /* double precision float in [0,1] */
#define GL_BLEND 0x0BE2
#define GL_BLEND_SRC 0x0BE1
#define GL_BLEND_DST 0x0BE0
-#define GL_ZERO 0x0
-#define GL_ONE 0x1
+#define GL_ZERO 0
+#define GL_ONE 1
#define GL_SRC_COLOR 0x0300
#define GL_ONE_MINUS_SRC_COLOR 0x0301
#define GL_SRC_ALPHA 0x0302
@@ -461,7 +461,7 @@ typedef double GLclampd; /* double precision float in [0,1] */
#define GL_DECR 0x1E03
/* Buffers, Pixel Drawing/Reading */
-#define GL_NONE 0x0
+#define GL_NONE 0
#define GL_LEFT 0x0406
#define GL_RIGHT 0x0407
/*GL_FRONT 0x0404 */
@@ -689,7 +689,7 @@ typedef double GLclampd; /* double precision float in [0,1] */
#define GL_EXTENSIONS 0x1F03
/* Errors */
-#define GL_NO_ERROR 0x0
+#define GL_NO_ERROR 0
#define GL_INVALID_ENUM 0x0500
#define GL_INVALID_VALUE 0x0501
#define GL_INVALID_OPERATION 0x0502