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/hw/nxagent/Events.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/hw/nxagent/Events.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index be5dd9032..c33564092 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -218,7 +218,7 @@ RegionPtr nxagentRemoteExposeRegion = NULL; static void nxagentForwardRemoteExpose(void); -static int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr); +static int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr); /* * This is from NXproperty.c. @@ -778,7 +778,7 @@ void nxagentGetEventMask(WindowPtr pWin, Mask *mask_return) *mask_return = mask; } -static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr) +static int nxagentChangeMapPrivate(WindowPtr pWin, void * ptr) { if (pWin && nxagentWindowPriv(pWin)) { @@ -788,7 +788,7 @@ static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr) return WT_WALKCHILDREN; } -static int nxagentChangeVisibilityPrivate(WindowPtr pWin, pointer ptr) +static int nxagentChangeVisibilityPrivate(WindowPtr pWin, void * ptr) { if (pWin && nxagentWindowPriv(pWin)) { @@ -4276,7 +4276,7 @@ void nxagentAddRectToRemoteExposeRegion(BoxPtr rect) REGION_UNINIT(nxagentDefaultScreen, &exposeRegion); } -int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr) +int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr) { RegionPtr exposeRgn; RegionPtr remoteExposeRgn; |