summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2003-10-25 05:44:47 +0000
committerKeith Packard <keithp@keithp.com>2003-10-25 05:44:47 +0000
commit91dfc6b455a03f9f313177ea0e1a3be841cd23a5 (patch)
treeb5132078860e18ccf118e6499f4f19407d159af2
parentfaa7c94689f3613cab95a94345fa742c25b01ef4 (diff)
Function pointer initializers in wrong order (oops)
Missing return value Not obeying autoconf HAVE_ALLOCA_H all of the time.
-rw-r--r--hw/kdrive/mach64/mach64.c4
-rw-r--r--hw/kdrive/src/kshadow.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c
index 8e03ab8b0..d03667492 100644
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@@ -55,7 +55,6 @@ mach64ScreenInit (KdScreenInfo *screen)
{
Mach64CardInfo *mach64c = screen->card->driver;
Mach64ScreenInfo *mach64s;
- int screen_size, memory;
mach64s = (Mach64ScreenInfo *) xalloc (sizeof (Mach64ScreenInfo));
if (!mach64s)
@@ -409,6 +408,7 @@ KdCardFuncs mach64Funcs = {
mach64CardInit, /* cardinit */
mach64ScreenInit, /* scrinit */
mach64InitScreen, /* initScreen */
+ mach64FinishInitScreen, /* finishInitScreen */
mach64CreateResources, /* createRes */
mach64Preserve, /* preserve */
mach64Enable, /* enable */
@@ -432,6 +432,4 @@ KdCardFuncs mach64Funcs = {
vesaGetColors, /* getColors */
vesaPutColors, /* putColors */
-
- mach64FinishInitScreen, /* finishInitScreen */
};
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index c12971628..f4b593f26 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -76,6 +76,7 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow
else
shadowUnset (pScreen);
}
+ return TRUE;
}
void