From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 09:36:08 +0200
Subject: 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>
---
 nx-X11/programs/Xserver/include/gc.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/include/gc.h')

diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h
index 77c2f20c6..1c0c90d3e 100644
--- a/nx-X11/programs/Xserver/include/gc.h
+++ b/nx-X11/programs/Xserver/include/gc.h
@@ -51,7 +51,13 @@ SOFTWARE.
 #define GC_H 
 
 #include <X11/X.h>	/* for GContext, Mask */
+
+#ifndef _XTYPEDEF_POINTER
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER       1
+#endif /* _XTYPEDEF_POINTER */
 #include <X11/Xdefs.h>	/* for Bool */
+
 #include <X11/Xproto.h>
 #include "screenint.h"	/* for ScreenPtr */
 #include "pixmap.h"	/* for DrawablePtr */
@@ -103,7 +109,7 @@ extern int DoChangeGC(
 
 typedef union {
     CARD32 val;
-    pointer ptr;
+    void * ptr;
 } ChangeGCVal, *ChangeGCValPtr;
 
 extern int dixChangeGC(
@@ -125,7 +131,7 @@ extern int CopyGC(
     BITS32 /*mask*/);
 
 extern int FreeGC(
-    pointer /*pGC*/,
+    void * /*pGC*/,
     XID /*gid*/);
 
 extern void SetGCMask(
-- 
cgit v1.2.3