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/dri3 | |
| 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/dri3')
| -rw-r--r-- | xorg-server/dri3/dri3_event.c | 6 | ||||
| -rw-r--r-- | xorg-server/dri3/dri3_request.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/dri3/dri3_event.c b/xorg-server/dri3/dri3_event.c index 02f0f6579..cb509a26d 100644 --- a/xorg-server/dri3/dri3_event.c +++ b/xorg-server/dri3/dri3_event.c @@ -29,7 +29,7 @@ RESTYPE dri3_event_type; static int -dri3_free_event(pointer data, XID id) +dri3_free_event(void *data, XID id) { dri3_event_ptr dri3_event = (dri3_event_ptr) data; dri3_window_priv_ptr window_priv = dri3_window_priv(dri3_event->window); @@ -41,7 +41,7 @@ dri3_free_event(pointer data, XID id) break; } } - free((pointer) dri3_event); + free((void *) dri3_event); return 1; } @@ -145,7 +145,7 @@ dri3_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask) event->next = window_priv->events; window_priv->events = event; - if (!AddResource(event->id, dri3_event_type, (pointer) event)) + if (!AddResource(event->id, dri3_event_type, (void *) event)) return BadAlloc; return Success; diff --git a/xorg-server/dri3/dri3_request.c b/xorg-server/dri3/dri3_request.c index 4e1408fb5..31dce83f6 100644 --- a/xorg-server/dri3/dri3_request.c +++ b/xorg-server/dri3/dri3_request.c @@ -168,7 +168,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client) (*drawable->pScreen->DestroyPixmap) (pixmap); return rc; } - if (AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pixmap)) + if (AddResource(stuff->pixmap, RT_PIXMAP, (void *) pixmap)) return Success; return Success; @@ -189,7 +189,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client) PixmapPtr pixmap; REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq); - rc = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP, + rc = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixWriteAccess); if (rc != Success) { client->errorValue = stuff->pixmap; |