summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/get.c2
-rw-r--r--src/mesa/main/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 06d71725039..6d988408d70 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -6380,7 +6380,7 @@ _mesa_GetString( GLenum name )
static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
- static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
+ static const char *version_1_5 = "1.4 Mesa " MESA_VERSION_STRING;
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 4205c5c6644..a8c3dfc03a5 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -44,7 +44,7 @@
#define OPENGL_VERSION_STRING "1.4"
/* To make version comparison easy */
-#define OPENGL_VERSION(a,b) (((a) << 16) + ((b) << 8) + (c))
+#define OPENGL_VERSION(a,b) (((a) << 16) + ((b) << 8) + (0))
#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR)