diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/xfixes/select.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip | |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/select.c')
| -rwxr-xr-x | nx-X11/programs/Xserver/xfixes/select.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c index ddc776ef7..464979165 100755 --- a/nx-X11/programs/Xserver/xfixes/select.c +++ b/nx-X11/programs/Xserver/xfixes/select.c @@ -52,7 +52,7 @@ typedef struct _SelectionEvent { static SelectionEventPtr selectionEvents; static void -XFixesSelectionCallback (CallbackListPtr *callbacks, pointer data, pointer args) +XFixesSelectionCallback (CallbackListPtr *callbacks, void * data, void * args) { SelectionEventPtr e; SelectionInfoRec *info = (SelectionInfoRec *) args; @@ -172,13 +172,13 @@ XFixesSelectSelectionInput (ClientPtr pClient, */ if (!LookupIDByType(pWindow->drawable.id, SelectionWindowType)) if (!AddResource (pWindow->drawable.id, SelectionWindowType, - (pointer) pWindow)) + (void *) pWindow)) { xfree (e); return BadAlloc; } - if (!AddResource (e->clientResource, SelectionClientType, (pointer) e)) + if (!AddResource (e->clientResource, SelectionClientType, (void *) e)) return BadAlloc; *prev = e; @@ -240,7 +240,7 @@ SXFixesSelectionNotifyEvent (xXFixesSelectionNotifyEvent *from, } static int -SelectionFreeClient (pointer data, XID id) +SelectionFreeClient (void * data, XID id) { SelectionEventPtr old = (SelectionEventPtr) data; SelectionEventPtr *prev, e; @@ -259,7 +259,7 @@ SelectionFreeClient (pointer data, XID id) } static int -SelectionFreeWindow (pointer data, XID id) +SelectionFreeWindow (void * data, XID id) { WindowPtr pWindow = (WindowPtr) data; SelectionEventPtr e, next; |