6 files changed, 10 insertions, 4 deletions
diff --git a/gl/glext.h b/gl/glext.h
index adefd561d..c14219e8c 100644
--- a/gl/glext.h
+++ b/gl/glext.h
@@ -4606,7 +4606,6 @@ GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent)
 
 #ifndef GL_OES_single_precision
 #define GL_OES_single_precision 1
-typedef float GLclampf;
 typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
 typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
 typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
@@ -5802,7 +5801,6 @@ GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
 
 #ifndef GL_EXT_depth_bounds_test
 #define GL_EXT_depth_bounds_test 1
-typedef double GLclampd;
 #define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
 #define GL_DEPTH_BOUNDS_EXT               0x8891
 typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 84c85879c..4d982c082 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -96,6 +96,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index a037b606b..b51a3adf1 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -285,6 +285,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index f0470d3a1..382ffc41b 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -109,6 +109,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index b1cb9b736..e9247d04f 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -746,6 +746,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index a4373b712..4e55504b1 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -831,7 +831,7 @@ struct _glapi_table
    void (GLAPIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary); /* 787 */
    void (GLAPIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length); /* 788 */
    void (GLAPIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value); /* 789 */
-   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 790 */
+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 790 */
    void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 791 */
    void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 792 */
    GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 793 */
@@ -900,7 +900,7 @@ struct _glapi_table
    void (GLAPIENTRYP UnlockArraysEXT)(void); /* 856 */
    void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 857 */
    void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 858 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 859 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 859 */
    void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 860 */
    void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 861 */
    void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 862 */