merge XFree86 4.3.0.1 to -CURRENT

hw/xnest/Display.c

@@ -12,10 +12,11 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
@@ -89,7 +90,7 @@ void xnestOpenDisplay(argc, argv)
 	break;
       }
     if (xnestDefaultVisualIndex == UNDEFINED) 
-      FatalError("Uable to find desird default visual.\n");
+      FatalError("Unable to find desired default visual.\n");
   }
   else {
     vi.visualid = XVisualIDFromVisual(DefaultVisual(xnestDisplay, 
@@ -184,8 +185,6 @@ void xnestOpenDisplay(argc, argv)
 
 void xnestCloseDisplay()
 {
-  int i;
-
   if (!xnestDoFullGeneration || !xnestDisplay) return;
 
   /*