xserver: Branch 'master'

[Benjamin Close]

 hw/xnest/Keyboard.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f004ab9a83e209943760e1faa39f06c8eeb27af
Author: Benjamin Close <Benjamin.Close at clearchain.com>
Date:   Thu Jan 22 01:36:31 2009 +1030

    XNest: Fix the build caused by __XKBDEFRULES__ -> XKB_DFLT_RULES in 23862ede59a9ce11a06ec5151bde460fb836c603

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 9adf78f..16e9fdc 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -67,7 +67,7 @@ extern	Status	XkbGetControls(
 #define	XKB_CONFIG_FILE		"X0-config.keyboard"
 #endif
 #ifndef XKB_DFLT_RULES_FILE
-#define	XKB_DFLT_RULES_FILE	__XKBDEFRULES__
+#define	XKB_DFLT_RULES_FILE	XKB_DFLT_RULES
 #endif
 #ifndef XKB_DFLT_KB_LAYOUT
 #define	XKB_DFLT_KB_LAYOUT	"us"