changeset 19952:f48e650a68b5

Use GLint instead of just int in calls to glGetIntegerv to match prototype. * __osmesa_print__.cc: Declare variables used in glGetIntegerv to be of type GLint.
author Rik <rik@octave.org>
date Sun, 08 Mar 2015 05:53:11 -0700
parents 6049bdfa8d56
children 66928b4546ab
files libinterp/dldfcn/__osmesa_print__.cc
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/__osmesa_print__.cc	Sun Mar 08 09:48:45 2015 +0100
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Sun Mar 08 05:53:11 2015 -0700
@@ -152,11 +152,10 @@
 
   // Test for a bug in OSMesa with version < 9.0
   //
-  // Unfortunately the macros OSMESA_MAJOR_VERSION and
-  // OSMESA_MINOR_VERSION weren't updated between many releases and
-  // can't be used for detection.  (Version 8.0 until 9.1.4 all return
-  // MAJOR 6, MINOR 5)
-  int z, s;
+  // Unfortunately the macros OSMESA_MAJOR_VERSION and OSMESA_MINOR_VERSION
+  // weren't updated between many releases and can't be used for detection.
+  // (Version 8.0 until 9.1.4 all return MAJOR 6, MINOR 5)
+  GLint z, s;
   glGetIntegerv (GL_DEPTH_BITS, &z);
   glGetIntegerv (GL_STENCIL_BITS, &s);
   if (z != 16 || s != 0)