fix bugs created by adding GL 1.5

git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@198 783a27ee-832a-0410-bc00-9f386506c6dd

Makefile

@@ -31,8 +31,8 @@
 GLEW_DEST ?= /usr
 
 GLEW_MAJOR = 1
-GLEW_MINOR = 1
-GLEW_MICRO = 5
+GLEW_MINOR = 2
+GLEW_MICRO = 0
 GLEW_VERSION = $(GLEW_MAJOR).$(GLEW_MINOR).$(GLEW_MICRO)
 
 TARDIR = ../glew-$(GLEW_VERSION)

auto/Makefile

@@ -7,8 +7,8 @@
 # Foundation or, at your option, any later version.
 
 GLEW_MAJOR = 1
-GLEW_MINOR = 1
-GLEW_MICRO = 5
+GLEW_MINOR = 2
+GLEW_MICRO = 0
 GLEW_VERSION = $(GLEW_MAJOR).$(GLEW_MINOR).$(GLEW_MICRO)
 
 SHELL = bash

auto/bin/update_ext.sh

@@ -44,10 +44,15 @@ if [ ! -d $1 ] ; then
 	$1/GL_HP_occlusion_test
     rm -f $1/GL_HP_occlusion_test.bak
 
+# fix GLvoid in GL_ARB_vertex_buffer_objects
+    perl -e 's/ void\*/ GLvoid\*/g' -pi.bak \
+        $1/GL_ARB_vertex_buffer_object
+    rm -f $1/GL_ARB_vertex_buffer_object.bak
+
 # fix WGL_ATI_pixel_format_float
     cat >> $1/WGL_ATI_pixel_format_float <<EOT
 	GL_RGBA_FLOAT_MODE_ATI 0x8820
-	GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835i
+	GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
 EOT
 
 # add typedefs to GL_ARB_vertex_buffer_object; (from personal communication

auto/core/GL_VERSION_1_5

@@ -69,5 +69,5 @@ http://www.opengl.org/documentation/specs/version1.5/glspec15.pdf
 	GLboolean glUnmapBuffer (GLenum target)
 	void glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params)
 	void glGetBufferPointerv (GLenum target, GLenum pname, GLvoid** params)
-	typedef ptrdiff_t GLsizeiptrARB
-	typedef ptrdiff_t GLintptrARB
+	typedef ptrdiff_t GLsizeiptr
+	typedef ptrdiff_t GLintptr

auto/src/glew_pre.h

@@ -125,6 +125,13 @@
 #  endif
 #endif
 /* <stddef.h> */
+#if !defined(_W64)
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#    define _W64 __w64
+#  else
+#    define _W64
+#  endif
+#endif
 #ifndef _PTRDIFF_T_DEFINED
 #  ifdef  _WIN64
 typedef __int64 ptrdiff_t;