Solved compile problems due to latest merge

7 files changed, 28 insertions, 22 deletions

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 59bed9019..1067a177d 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -198,6 +198,7 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />

@@ -243,7 +244,10 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />

-    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)/hash_table_program.obj</ObjectFileName>

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)/hash_table_program.obj</ObjectFileName>

+    </ClCompile>

     <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" />

     <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp" />

     <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" />

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 2010982ca..633a706b9 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -404,9 +404,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -704,6 +701,12 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 56e6ef84d..77f4162f9 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -42,7 +42,7 @@
 #include "dispatch.h"
 
 int
-__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
+__glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
@@ -64,7 +64,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+            CALL_GetCompressedTexImage(GET_DISPATCH(),
                                           (target, level, answer));
         }
 
@@ -86,7 +86,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
+__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl,
                                        GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
@@ -110,7 +110,7 @@ __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+            CALL_GetCompressedTexImage(GET_DISPATCH(),
                                           (target, level, answer));
         }
 
diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c
index 4eef3d434..01e33d5c9 100644
--- a/xorg-server/glx/render2.c
+++ b/xorg-server/glx/render2.c
@@ -243,12 +243,12 @@ __glXDisp_DrawArrays(GLbyte * pc)
             break;
         case GL_SECONDARY_COLOR_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
+            CALL_SecondaryColorPointer(GET_DISPATCH(),
                                           (numVals, datatype, stride, pc));
             break;
         case GL_FOG_COORD_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc));
             break;
         default:
             break;
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c
index f7525fad1..435fa26ad 100644
--- a/xorg-server/glx/render2swap.c
+++ b/xorg-server/glx/render2swap.c
@@ -365,12 +365,12 @@ __glXDispSwap_DrawArrays(GLbyte * pc)
             break;
         case GL_SECONDARY_COLOR_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
+            CALL_SecondaryColorPointer(GET_DISPATCH(),
                                           (numVals, datatype, stride, pc));
             break;
         case GL_FOG_COORD_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc));
             break;
         default:
             break;
diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile
index e04599e52..71a327c8e 100644..100755
--- a/xorg-server/xkb/makefile
+++ b/xorg-server/xkb/makefile
@@ -4,8 +4,7 @@ DDX_SRCS = \
         ddxBeep.c \
         ddxCtrls.c \
         ddxLEDs.c \
-        ddxLoad.c \
-        ddxList.c
+        ddxLoad.c
 
 DIX_SRCS = \
         xkb.c \
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 17dab8ec9..d27d90d7e 100755
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -5645,14 +5645,14 @@ ProcXkbListComponents(ClientPtr client)
     rep.type = X_Reply;
     rep.deviceID = dev->id;
     rep.sequenceNumber = client->sequence;
-    rep.length = 0,
-    rep.nKeymaps = 0,
-    rep.nKeycodes = 0,
-    rep.nTypes = 0,
-    rep.nCompatMaps = 0,
-    rep.nSymbols = 0,
-    rep.nGeometries = 0,
-    rep.extra = 0
+    rep.length = 0;
+    rep.nKeymaps = 0;
+    rep.nKeycodes = 0;
+    rep.nTypes = 0;
+    rep.nCompatMaps = 0;
+    rep.nSymbols = 0;
+    rep.nGeometries = 0;
+    rep.extra = 0;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);