[xorg-commit-diffs] xc/programs/Xserver/hw/xnest Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 Keyboard.c, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xnest
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xnest

Modified Files:
      Tag: XPRINT
	Imakefile Keyboard.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:48:19 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:33 -0000	1.1.4.2.6.1.6.1
@@ -60,7 +60,7 @@
            -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(LIBSRC) -I$(SERVERSRC)/Xext
 
 DEFINES = $(OS_DEFINES) $(EXT_DEFINES) -DNO_HW_ONLY_EXTS \
-	  -UXFree86LOADER  -UMITSHM
+	  -UXFree86LOADER  -UMITSHM $(XKBDEFRULESDEFS)
 
 XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb/\"
 

Index: Keyboard.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/Keyboard.c,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Keyboard.c	4 Mar 2004 17:48:19 -0000	1.1.4.2.6.1
+++ b/Keyboard.c	10 Apr 2004 09:05:34 -0000	1.1.4.2.6.1.6.1
@@ -1,4 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
+/* $XdotOrg$ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -13,7 +14,6 @@
 
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
-
 #define NEED_EVENTS
 #include "X.h"
 #include "Xproto.h"
@@ -65,7 +65,7 @@
 #define	XKB_CONFIG_FILE		"X0-config.keyboard"
 #endif
 #ifndef XKB_DFLT_RULES_FILE
-#define	XKB_DFLT_RULES_FILE	"xfree86"
+#define	XKB_DFLT_RULES_FILE	__XKBDEFRULES__
 #endif
 #ifndef XKB_DFLT_KB_LAYOUT
 #define	XKB_DFLT_KB_LAYOUT	"us"