From 4276103912bf0c43fae0dc65a61b57fe0a830c47 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Wed, 4 Sep 2013 08:14:41 -0400 Subject: [PATCH] Bug 911853 - OpenGL types should be explicit-size integer types - r=jgilbert --- gfx/gl/GLContext.h | 2 -- gfx/gl/GLTypes.h | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h index 0de58e125e14..6ec2fec93f4d 100644 --- a/gfx/gl/GLContext.h +++ b/gfx/gl/GLContext.h @@ -48,8 +48,6 @@ #include "SurfaceTypes.h" #include "GLScreenBuffer.h" -typedef char realGLboolean; - #include "GLContextSymbols.h" #include "mozilla/mozalloc.h" diff --git a/gfx/gl/GLTypes.h b/gfx/gl/GLTypes.h index 866f041626db..8044370ea4d5 100644 --- a/gfx/gl/GLTypes.h +++ b/gfx/gl/GLTypes.h @@ -12,16 +12,16 @@ #include #include -typedef unsigned int GLenum; -typedef unsigned int GLbitfield; -typedef unsigned int GLuint; -typedef int GLint; -typedef int GLsizei; -typedef char realGLboolean; -typedef signed char GLbyte; -typedef short GLshort; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; +typedef uint32_t GLenum; +typedef uint32_t GLbitfield; +typedef uint32_t GLuint; +typedef int32_t GLint; +typedef int32_t GLsizei; +typedef int8_t realGLboolean; +typedef int8_t GLbyte; +typedef int16_t GLshort; +typedef uint8_t GLubyte; +typedef uint16_t GLushort; typedef float GLfloat; typedef float GLclampf; #ifndef GLdouble_defined