[xorg-commit-diffs] xc/programs/Xserver/hw/xnest Imakefile, 1.1.4.5, 1.1.4.6 Keyboard.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile Keyboard.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/hw/xnest/Imakefile,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Imakefile	26 Mar 2004 01:24:02 -0000	1.1.4.5
+++ b/Imakefile	15 Apr 2004 10:17:19 -0000	1.1.4.6
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Keyboard.c	5 Mar 2004 13:41:02 -0000	1.1.4.3
+++ b/Keyboard.c	15 Apr 2004 10:17:19 -0000	1.1.4.4
@@ -1,4 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
+/* $XdotOrg$ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -65,7 +66,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"