diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/fb/fbscreen.c | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/fb/fbscreen.c')
| -rw-r--r-- | xorg-server/fb/fbscreen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c index f9080a445..b2b973974 100644 --- a/xorg-server/fb/fbscreen.c +++ b/xorg-server/fb/fbscreen.c @@ -90,7 +90,7 @@ _fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap) } 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 */ @@ -135,7 +135,7 @@ fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */ #ifdef FB_ACCESS_WRAPPER Bool wfbFinishScreenInit(ScreenPtr pScreen, - pointer pbits, + void *pbits, int xsize, int ysize, int dpix, @@ -146,7 +146,7 @@ wfbFinishScreenInit(ScreenPtr pScreen, #else Bool fbFinishScreenInit(ScreenPtr pScreen, - pointer pbits, + void *pbits, int xsize, int ysize, int dpix, int dpiy, int width, int bpp) #endif { @@ -224,7 +224,7 @@ fbFinishScreenInit(ScreenPtr pScreen, #ifdef FB_ACCESS_WRAPPER Bool wfbScreenInit(ScreenPtr pScreen, - pointer pbits, + void *pbits, int xsize, int ysize, int dpix, @@ -242,7 +242,7 @@ wfbScreenInit(ScreenPtr pScreen, #else Bool fbScreenInit(ScreenPtr pScreen, - pointer pbits, + void *pbits, int xsize, int ysize, int dpix, int dpiy, int width, int bpp) { if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp)) |