aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/window.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-06-22 09:36:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 12:54:40 +0100
commit68dd0b52e13c844d662192654fb10cb993257a59 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/include/window.h
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
downloadnx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/include/window.h')
-rw-r--r--nx-X11/programs/Xserver/include/window.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h
index 7c3fce092..cbfed645f 100644
--- a/nx-X11/programs/Xserver/include/window.h
+++ b/nx-X11/programs/Xserver/include/window.h
@@ -73,17 +73,17 @@ typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr)(
WindowPtr /*pWin*/,
- pointer /*data*/);
+ void * /*data*/);
extern int TraverseTree(
WindowPtr /*pWin*/,
VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ void * /*data*/);
extern int WalkTree(
ScreenPtr /*pScreen*/,
VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ void * /*data*/);
extern WindowPtr AllocateWindow(
ScreenPtr /*pScreen*/);
@@ -122,7 +122,7 @@ extern WindowPtr CreateWindow(
int* /*error*/);
extern int DeleteWindow(
- pointer /*pWin*/,
+ void * /*pWin*/,
XID /*wid*/);
extern void DestroySubwindows(