From 808f6851cfc0d05d372fdd442c1c298fbd4ea55c Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sat, 15 Mar 2008 20:42:10 -0300 Subject: [PATCH] Compile warning fixes. Add prototypes to leo.h, removed nested prototypes and prototypes to non existent functions. --- src/leo.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/leo_accel.c | 2 -- src/leo_driver.c | 5 ----- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/src/leo.h b/src/leo.h index eec21ba..7a24f28 100644 --- a/src/leo.h +++ b/src/leo.h @@ -97,4 +97,48 @@ extern DevPrivateKey LeoGCPrivateKey; extern int leoRopTable[]; +/* leo_accel.c */ +extern void LeoVtChange(ScreenPtr pScreen, int enter); +extern Bool LeoAccelInit(ScreenPtr pScreen, LeoPtr pLeo); + +/* leo_checks.c */ +extern int LeoCheckTile(PixmapPtr pPixmap, LeoStipplePtr stipple, + int ox, int oy); +extern int LeoCheckFill(GCPtr pGC, DrawablePtr pDrawable); +extern int LeoCheckStipple(PixmapPtr pPixmap, LeoStipplePtr stipple, + int ox, int oy); + +/* leo_cursor.c */ +extern Bool LeoHWCursorInit(ScreenPtr pScreen); + +/* leo_frect.c */ +extern void LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, + int nrectFill, xRectangle *prectInit); +extern void LeoPolyFillRect1Rect(DrawablePtr pDrawable, GCPtr pGC, + int nrectFill, xRectangle *prectInit); + +/* leo_frectsp.c */ +extern void LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC, + int nrectFill, xRectangle *prectInit); + +/* leo_fspans.c */ +extern void LeoFillSpansSolid(DrawablePtr pDrawable, GCPtr pGC, int n, + DDXPointPtr ppt, int *pwidth, int fSorted); + +/* leo_fspanssp.c */ +extern void LeoFillSpansStippled(DrawablePtr pDrawable, GCPtr pGC, int n, + DDXPointPtr ppt, int *pwidth, int fSorted); + +/* leo_glyph.c */ +extern void LeoPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + pointer pGlyphBase); +extern void LeoTEGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + pointer pGlyphBase); +extern void LeoPolyTEGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + pointer pGlyphBase); + + #endif /* LEO_H */ diff --git a/src/leo_accel.c b/src/leo_accel.c index 4408b24..e062e16 100644 --- a/src/leo_accel.c +++ b/src/leo_accel.c @@ -94,8 +94,6 @@ void LeoVtChange (ScreenPtr pScreen, int enter) ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW; } -extern Bool LeoCreateGC (GCPtr pGC); - Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo) { LeoCommand0 *lc0; diff --git a/src/leo_driver.c b/src/leo_driver.c index 9213927..e1687c6 100644 --- a/src/leo_driver.c +++ b/src/leo_driver.c @@ -461,7 +461,6 @@ LeoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) LeoPtr pLeo; int ret; VisualPtr visual; - extern Bool LeoAccelInit(ScreenPtr pScreen, LeoPtr pLeo); /* * First get the ScrnInfoRec @@ -544,8 +543,6 @@ LeoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Initialize HW cursor layer. Must follow software cursor initialization*/ if (pLeo->HWCursor) { - extern Bool LeoHWCursorInit(ScreenPtr pScreen); - if(!LeoHWCursorInit(pScreen)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Hardware cursor initialization failed\n"); @@ -595,8 +592,6 @@ LeoAdjustFrame(int scrnIndex, int x, int y, int flags) return; } -extern void LeoVtChange (ScreenPtr pScreen, int enter); - /* * This is called when VT switching back to the X server. Its job is * to reinitialise the video mode. -- 1.5.3.2