diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /mesalib/include/GL | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'mesalib/include/GL')
| -rw-r--r-- | mesalib/include/GL/gl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h index e65e1bc8a..97094fc59 100644 --- a/mesalib/include/GL/gl.h +++ b/mesalib/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 |