aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb/fb.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-15 21:23:25 +0100
committermarha <marha@users.sourceforge.net>2014-01-15 21:23:25 +0100
commit1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch)
treed08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/fb/fb.h
parentaaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff)
downloadvcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz
vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2
vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/fb/fb.h')
-rw-r--r--xorg-server/fb/fb.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index 26957df4c..90577677b 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -776,7 +776,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
/*
* fballpriv.c
@@ -1229,7 +1229,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
extern _X_EXPORT void
@@ -1237,7 +1237,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
/*
* fbimage.c
@@ -1409,7 +1409,7 @@ extern _X_EXPORT void
_fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap);
extern _X_EXPORT Bool
- fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
+ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */
@@ -1418,7 +1418,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1430,7 +1430,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1442,14 +1442,14 @@ wfbScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize, int dpix, int dpiy, int width, int bpp);
extern _X_EXPORT Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
/*