[xserver-commit] xserver/hw/kdrive/mach64 mach64.c,1.15.2.2,1.15.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/mach64
In directory pdx:/tmp/cvs-serv2700/hw/kdrive/mach64

Modified Files:
      Tag: xfixes_2_branch
	mach64.c 
Log Message:
	* hw/kdrive/mach64/mach64.c: (mach64ScreenInit):
	Function pointer initializers in wrong order (oops)
	* hw/kdrive/src/kshadow.c: (KdShadowSet):
	Missing return value
	* include/os.h:
	Not obeying autoconf HAVE_ALLOCA_H all of the time.


Index: mach64.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mach64/mach64.c,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- mach64.c	24 Oct 2003 09:34:33 -0000	1.15.2.2
+++ mach64.c	25 Oct 2003 05:44:47 -0000	1.15.2.3
@@ -55,7 +55,6 @@
 {
     Mach64CardInfo	*mach64c = screen->card->driver;
     Mach64ScreenInfo	*mach64s;
-    int			screen_size, memory;
 
     mach64s = (Mach64ScreenInfo *) xalloc (sizeof (Mach64ScreenInfo));
     if (!mach64s)
@@ -409,6 +408,7 @@
     mach64CardInit,	    /* cardinit */
     mach64ScreenInit,	    /* scrinit */
     mach64InitScreen,	    /* initScreen */
+    mach64FinishInitScreen, /* finishInitScreen */
     mach64CreateResources,  /* createRes */
     mach64Preserve,	    /* preserve */
     mach64Enable,	    /* enable */
@@ -432,6 +432,4 @@
     
     vesaGetColors,    	    /* getColors */
     vesaPutColors,	    /* putColors */
-
-    mach64FinishInitScreen, /* finishInitScreen */
 };