Attachment 70909 Details for Bug 57802 – remove compiler warnings when including GL/gl.h with other gl headers

[patch] remove compiler warnings when including GL/gl.h with other gl headers

0001-remove-compiler-warnings-when-including-GL-gl.h-with.patch (text/plain), 1.90 KB, created by Matthew Waters on 2012-12-02 11:49:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Waters

Created: 2012-12-02 11:49:00 UTC

Size: 1.90 KB

patch

obsolete

>From 1ddfc2c1ada13f8968e1f01ee7481440666b45b4 Mon Sep 17 00:00:00 2001
>From: Matthew Waters <ystreet00@gmail.com>
>Date: Sun, 2 Dec 2012 22:28:34 +1100
>Subject: [PATCH] remove 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.
>---
> include/GL/gl.h |   12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/include/GL/gl.h b/include/GL/gl.h
>index e65e1bc..97094fc 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
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 57802: 70909

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.