diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-08-03 08:52:17 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-08-03 08:52:17 +0000 |
| commit | e6d0b18c24f7f84aabed763be1cc8414883fab95 (patch) | |
| tree | 1dbeb83a7e9c67d5035de5f34fff7ee331c848e7 | |
| parent | bfbb40c28ce6e98c82973bd96054d4787579eaa6 (diff) | |
Fix declaration of XAACachePlanarMonoStippleProc. Rename
XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for
consistency with other parts of xaa and fix forward declaration in
xaalocal.h. Fixes last comments on Bug #962.
| -rw-r--r-- | hw/xfree86/xaa/xaaPCache.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/xaa/xaalocal.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index ce1e70d22..94790d21c 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1653,8 +1653,8 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -XAACachePlanarMonoStippleProc * -XAACachePlanarMonoStippleWeak(void) { return XAACachePlanarMonoStipple; } +XAACachePlanarMonoStippleProc +XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; } XAACacheInfoPtr XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 00fcb7455..883e64d5b 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1516,9 +1516,8 @@ XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix); XAACacheInfoPtr XAACachePlanarMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix); -typedef XAACacheInfoPtr *XAACachePlanarMonoStippleProc(ScrnInfoPtr, PixmapPtr); - -XAACachePlanarMonoStippleProc *XAAGetCachePlanarMonoStipple(void); +typedef XAACacheInfoPtr (*XAACachePlanarMonoStippleProc)(ScrnInfoPtr, PixmapPtr); +XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void); XAACacheInfoPtr XAACacheStipple(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg); |