From 4a4018aabb79405f1b50809f76e4bff4d0ead33c Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 27 Sep 2014 17:53:06 +0000 Subject: Update to xserver 1.16.1. Tested by naddy@, jsg@ & kettenis@ --- xserver/mi/mi.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'xserver/mi/mi.h') diff --git a/xserver/mi/mi.h b/xserver/mi/mi.h index 638fc6bc7..1209a16c4 100644 --- a/xserver/mi/mi.h +++ b/xserver/mi/mi.h @@ -271,7 +271,7 @@ extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ , int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - pointer /*pglyphBase */ + void */*pglyphBase */ ); extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ , @@ -280,7 +280,7 @@ extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ , int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - pointer /*pglyphBase */ + void */*pglyphBase */ ); /* mipoly.c */ @@ -387,7 +387,7 @@ extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ , int /*depth */ , int /*bitsPerPixel */ , int /*devKind */ , - pointer /*pPixData */ + void */*pPixData */ ); extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */ @@ -395,11 +395,11 @@ extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */ extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ , int /*width */ , - pointer /*pbits */ + void */*pbits */ ); extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ , - pointer /*pbits */ , + void */*pbits */ , int /*xsize */ , int /*ysize */ , int /*dpix */ , @@ -507,6 +507,10 @@ extern _X_EXPORT void miMarkUnrealizedWindow(WindowPtr /*pChild */ , extern _X_EXPORT void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth); +extern _X_EXPORT WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y); + +extern _X_EXPORT WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y); + /* mizerarc.c */ extern _X_EXPORT void miZeroPolyArc(DrawablePtr /*pDraw */ , -- cgit v1.2.3