From 5c64a642a4658156cac079e25532a188611961ee Mon Sep 17 00:00:00 2001 From: i-nod Date: Sat, 6 Mar 2010 23:54:11 +0000 Subject: [PATCH] Fix warnings on MacOS builds that were caused by [10179]. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10183 4a71c877-e1ca-e34f-864e-861f7616d084 --- lib/ivis_opengl/piestate.c | 4 ++-- lib/ivis_opengl/screen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ivis_opengl/piestate.c b/lib/ivis_opengl/piestate.c index 786f55b07..1a4796c70 100644 --- a/lib/ivis_opengl/piestate.c +++ b/lib/ivis_opengl/piestate.c @@ -78,7 +78,7 @@ static char *readShaderBuf(const char *name) // Retrieve shader compilation errors static void printShaderInfoLog(GLuint shader) { - int infologLen = 0; + GLint infologLen = 0; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infologLen); if (infologLen > 0) @@ -95,7 +95,7 @@ static void printShaderInfoLog(GLuint shader) // Retrieve shader linkage errors static void printProgramInfoLog(GLuint program) { - int infologLen = 0; + GLint infologLen = 0; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infologLen); if (infologLen > 0) diff --git a/lib/ivis_opengl/screen.c b/lib/ivis_opengl/screen.c index b0dd797fd..45fb2a27b 100644 --- a/lib/ivis_opengl/screen.c +++ b/lib/ivis_opengl/screen.c @@ -199,7 +199,7 @@ bool screenInitialise( debug(LOG_3D, " * Vertex Buffer Object (VBO) %s supported.", GL_ARB_vertex_buffer_object ? "is" : "is NOT"); glGetIntegerv(GL_MAX_TEXTURE_UNITS, &glMaxTUs); - debug(LOG_3D, " * Total number of Texture Units (TUs) supported is %d.", glMaxTUs); + debug(LOG_3D, " * Total number of Texture Units (TUs) supported is %d.", (int) glMaxTUs); if (!GLEE_VERSION_1_4) { @@ -240,7 +240,7 @@ bool screenInitialise( addDumpInfo(buf); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &glMaxTIUs); - debug(LOG_3D, " * Total number of Texture Image Units (TIUs) supported is %d.", glMaxTIUs); + debug(LOG_3D, " * Total number of Texture Image Units (TIUs) supported is %d.", (int) glMaxTIUs); if (!pie_LoadShaders()) debug(LOG_WARNING, "Can't use shaders! Switching back to fixed pipeline...");;