[xorg-commit-diffs] xc/programs/Xserver/xkb Imakefile, 1.1.4.3, 1.1.4.4 ddxFakeMtn.c, 1.1.4.6, 1.1.4.7

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/xkb
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/xkb

Modified Files:
      Tag: XORG-CURRENT
	Imakefile ddxFakeMtn.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/xkb/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:12 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:35 -0000	1.1.4.4
@@ -25,7 +25,7 @@
 
 XKB_DDXDEFS = XkbServerDefines
 
-#if XF86Server
+#if XF86Server || XorgServer
 XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
    XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
 #endif
@@ -58,7 +58,7 @@
 LintLibraryTarget(xkb,$(SRCS))
 NormalLintTarget($(SRCS))
 
-#if XF86Server
+#if XF86Server || XorgServer
 ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)

Index: ddxFakeMtn.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/xkb/ddxFakeMtn.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/ddxFakeMtn.c	5 Mar 2004 13:41:12 -0000	1.1.4.6
+++ b/ddxFakeMtn.c	15 Apr 2004 10:17:35 -0000	1.1.4.7
@@ -38,7 +38,7 @@
 #include "XKBsrv.h"
 #include "XI.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -55,7 +55,7 @@
     GetSpritePosition(&oldX, &oldY);
     pScreen = oldScreen = GetSpriteWindow()->drawable.pScreen;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if (!noPanoramiXExtension) {
 	BoxRec box;
 	int i;