From da6e08e699523199c29d8d0f062b74d48f420079 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sat, 15 Mar 2008 21:14:34 -0300 Subject: [PATCH] Compile warning fixes. Declare CG6HWCursorInit in cg6.h, and remove nested external prototypes. --- src/cg6.h | 3 +++ src/cg6_driver.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cg6.h b/src/cg6.h index 52135a8..e2f4bbc 100644 --- a/src/cg6.h +++ b/src/cg6.h @@ -94,4 +94,7 @@ extern int Cg6WindowPrivateIndex; extern int cg6RopTable[]; +/* cg6_cursor.c */ +extern Bool CG6HWCursorInit(ScreenPtr pScreen); + #endif /* CG6_H */ diff --git a/src/cg6_driver.c b/src/cg6_driver.c index 378def7..3120961 100644 --- a/src/cg6_driver.c +++ b/src/cg6_driver.c @@ -508,8 +508,6 @@ CG6ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) #if 0 if (!pCg6->NoAccel) { - extern Bool CG6AccelInit(ScreenPtr pScreen, Cg6Ptr pCg6); - if (!CG6AccelInit(pScreen, pCg6)) return FALSE; xf86Msg(X_INFO, "%s: Using acceleration\n", pCg6->psdp->device); @@ -522,8 +520,6 @@ CG6ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Initialize HW cursor layer. Must follow software cursor initialization*/ if (pCg6->HWCursor) { - extern Bool CG6HWCursorInit(ScreenPtr pScreen); - if(!CG6HWCursorInit(pScreen)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Hardware cursor initialization failed\n"); -- 1.5.3.2