aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/scrnintstr.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/scrnintstr.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/scrnintstr.h')
-rw-r--r--nx-X11/programs/Xserver/include/scrnintstr.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h
index ef9358689..297227493 100644
--- a/nx-X11/programs/Xserver/include/scrnintstr.h
+++ b/nx-X11/programs/Xserver/include/scrnintstr.h
@@ -85,8 +85,8 @@ typedef struct _Depth {
/*
- * There is a typedef for each screen function pointer so that code that
- * needs to declare a screen function pointer (e.g. in a screen private
+ * There is a typedef for each screen function void * so that code that
+ * needs to declare a screen function void * (e.g. in a screen private
* or as a local variable) can easily do so and retain full type checking.
*/
@@ -431,15 +431,15 @@ typedef void (* SendGraphicsExposeProcPtr)(
typedef void (* ScreenBlockHandlerProcPtr)(
int /*screenNum*/,
- pointer /*blockData*/,
- pointer /*pTimeout*/,
- pointer /*pReadmask*/);
+ void * /*blockData*/,
+ void * /*pTimeout*/,
+ void * /*pReadmask*/);
typedef void (* ScreenWakeupHandlerProcPtr)(
int /*screenNum*/,
- pointer /*wakeupData*/,
+ void * /*wakeupData*/,
unsigned long /*result*/,
- pointer /*pReadMask*/);
+ void * /*pReadMask*/);
typedef Bool (* CreateScreenResourcesProcPtr)(
ScreenPtr /*pScreen*/);
@@ -451,7 +451,7 @@ typedef Bool (* ModifyPixmapHeaderProcPtr)(
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
- pointer /*pPixData*/);
+ void * /*pPixData*/);
typedef PixmapPtr (* GetWindowPixmapProcPtr)(
WindowPtr /*pWin*/);
@@ -546,7 +546,7 @@ typedef struct _Screen {
a standard one.
*/
PixmapPtr PixmapPerDepth[1];
- pointer devPrivate;
+ void * devPrivate;
short numVisuals;
VisualPtr visuals;
int WindowPrivateLen;
@@ -668,8 +668,8 @@ typedef struct _Screen {
ScreenBlockHandlerProcPtr BlockHandler;
ScreenWakeupHandlerProcPtr WakeupHandler;
- pointer blockData;
- pointer wakeupData;
+ void * blockData;
+ void * wakeupData;
/* anybody can get a piece of this array */
DevUnion *devPrivates;