xserver/hw/xorg/common xf86Init.c,1.1,1.2 xf86cmap.c,1.1,1.2

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xorg/common
In directory pdx:/tmp/cvs-serv15203/hw/xorg/common

Modified Files:
	xf86Init.c xf86cmap.c 
Log Message:

	* configure.ac:
	* hw/xorg/Makefile.am:
	* hw/xorg/drivers/Makefile.am:
	* hw/xorg/drivers/fbdev:
	* hw/xorg/input/Makefile.am:
	* hw/xorg/input/mouse:
	Import fbdev and mouse drivers.

	* hw/xorg/common/xf86cmap.c:
	Test for whether pmap is !NULL, rather than just blindly calling
	CMapReinstallMap. This seems to break things, but meh.


Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xorg/common/xf86Init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/xf86Init.c	25 Apr 2004 13:52:09 -0000	1.1
+++ b/xf86Init.c	3 May 2004 15:39:43 -0000	1.2
@@ -300,10 +300,6 @@
     else
       xf86ServerName = argv[0];
 
-#ifdef DO_CHECK_BETA
-    xf86CheckBeta(extraDays, expKey);
-#endif
-
     xf86PrintBanner();
     xf86PrintMarkers();
     if (xf86LogFile)  {
@@ -1415,14 +1411,6 @@
 #endif
     return 1;
   }
-#ifdef DO_CHECK_BETA
-  if (!strcmp(argv[i],"-extendExpiry"))
-  {
-    extraDays = atoi(argv[i + 1]);
-    expKey = argv[i + 2];
-    return 3;
-  }
-#endif
   if (!strcmp(argv[i],"-verbose"))
   {
     if (++i < argc && argv[i])

Index: xf86cmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xorg/common/xf86cmap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/xf86cmap.c	25 Apr 2004 13:52:09 -0000	1.1
+++ b/xf86cmap.c	3 May 2004 15:39:43 -0000	1.2
@@ -51,7 +51,7 @@
 
 #ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
 #include "dgaproc.h"
 #endif
 
@@ -440,7 +440,7 @@
 	((1 << pmap->pVisual->nplanes) > pScreenPriv->maxColors))
 		return;
 
-    if(LOAD_PALETTE(pmap, index))
+    if(pmap && LOAD_PALETTE(pmap, index))
 	CMapReinstallMap(pmap);
 }