aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-20 16:33:58 +0100
committermarha <marha@users.sourceforge.net>2012-11-20 16:37:03 +0100
commitfc83ab987c84518c31793515c4f99a0df8ccd1cc (patch)
tree2f8e01251e2faba8369f28b85ba9c48de87136c6 /xorg-server
parent96f2a4b36eb811fa1f12dcde03bffc86cfd1781d (diff)
downloadvcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.gz
vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.bz2
vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.zip
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/glx/indirect_texture_compression.c8
-rw-r--r--xorg-server/glx/render2.c4
-rw-r--r--xorg-server/glx/render2swap.c4
-rwxr-xr-x[-rw-r--r--]xorg-server/xkb/makefile3
-rwxr-xr-xxorg-server/xkb/xkb.c16
5 files changed, 17 insertions, 18 deletions
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);