xserver: Branch 'master' - 3 commits

[Greg Kroah-Hartman]

 hw/xfree86/loader/loaderProcs.h |    1 +
 hw/xfree86/loader/loadmod.c     |    2 --
 hw/xnest/Keyboard.c             |    3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
diff-tree 9f31ef83be61a900c701fcbc9a43ffae40ca7005 (from 490ffc205a7714145cac0c63efeb6374ea28141f)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Jun 9 10:44:46 2006 -0700

    fix compiler warning in hw/xfree86/loader/loaderProcs.h

diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index 19752ab..12b5b99 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/hw/xfree86/loader/loaderProcs.h
@@ -56,6 +56,7 @@
 #ifndef _LOADERPROCS_H
 #define _LOADERPROCS_H
 
+#undef IN_LOADER
 #define IN_LOADER
 #include "xf86Module.h"
 #include <X11/fonts/fontmod.h>
diff-tree 490ffc205a7714145cac0c63efeb6374ea28141f (from 6119845d1ff832ea2b7c9cbe7ed6c6637cdcf305)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Jun 9 10:44:25 2006 -0700

    fix compiler warning in hw/xfree86/loader/loadmod.c

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 9c2f3a7..cf6751b 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -434,8 +434,6 @@ FindModule(const char *module, const cha
 	strcat(buf, *s);
 	/*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */
         if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
-	    int i;
-	
             if (buf[dirlen - 1] != '/') {
                 buf[dirlen++] = '/';
             }
diff-tree 6119845d1ff832ea2b7c9cbe7ed6c6637cdcf305 (from 1a7335ff932baa59a3283c50dd6007d81989b7e3)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Jun 9 10:14:08 2006 -0700

    fix compiler warnings in hw/xnest/Keyboard.c

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 9b4f1a1..a6fabf5 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -202,9 +202,6 @@ XkbError:
 			       xnestBell, xnestChangeKeyboardControl);
 #ifdef XKB
       } else {
-	FILE *file;
-	XkbConfigRtrnRec config;
-
 	XkbComponentNamesRec names;
 	char *rules, *model, *layout, *variants, *options;