diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
| commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/miext/cw/cw.h | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| download | nx-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/miext/cw/cw.h')
| -rw-r--r-- | nx-X11/programs/Xserver/miext/cw/cw.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/miext/cw/cw.h b/nx-X11/programs/Xserver/miext/cw/cw.h index 2563aed5e..42d8db381 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw.h +++ b/nx-X11/programs/Xserver/miext/cw/cw.h @@ -47,7 +47,7 @@ typedef struct { extern int cwGCIndex; #define getCwGC(pGC) ((cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr) -#define setCwGC(pGC,p) ((pGC)->devPrivates[cwGCIndex].ptr = (pointer) (p)) +#define setCwGC(pGC,p) ((pGC)->devPrivates[cwGCIndex].ptr = (void *) (p)) /* * One of these structures is allocated per Picture that gets used with a @@ -61,7 +61,7 @@ typedef struct { } cwPictureRec, *cwPicturePtr; #define getCwPicture(pPicture) ((cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr) -#define setCwPicture(pPicture,p) ((pPicture)->devPrivates[cwPictureIndex].ptr = (pointer) (p)) +#define setCwPicture(pPicture,p) ((pPicture)->devPrivates[cwPictureIndex].ptr = (void *) (p)) extern int cwPictureIndex; @@ -69,7 +69,7 @@ extern int cwWindowIndex; #define cwWindowPrivate(pWindow) ((pWindow)->devPrivates[cwWindowIndex].ptr) #define getCwPixmap(pWindow) ((PixmapPtr) cwWindowPrivate(pWindow)) -#define setCwPixmap(pWindow,pPixmap) (cwWindowPrivate(pWindow) = (pointer) (pPixmap)) +#define setCwPixmap(pWindow,pPixmap) (cwWindowPrivate(pWindow) = (void *) (pPixmap)) #define cwDrawableIsRedirWindow(pDraw) \ ((pDraw)->type == DRAWABLE_WINDOW && \ |