From 60014a4a98ff924ae7f6840781f768c1cc93bbab Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 15 Dec 2013 01:05:51 -0800
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>
---
 include/dixstruct.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'include/dixstruct.h')

diff --git a/include/dixstruct.h b/include/dixstruct.h
index 6f5667fcb..a11729bdf 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -74,8 +74,8 @@ typedef struct _saveSet {
 #define SaveSetAssignMap(ss,m)      ((ss).map = (m))
 
 typedef struct _Client {
-    pointer requestBuffer;
-    pointer osPrivate;          /* for OS layer, including scheduler */
+    void *requestBuffer;
+    void *osPrivate;             /* for OS layer, including scheduler */
     Mask clientAsMask;
     short index;
     unsigned char majorOp, minorOp;
@@ -149,10 +149,10 @@ SmartScheduleInit(void);
 typedef struct _WorkQueue {
     struct _WorkQueue *next;
     Bool (*function) (ClientPtr /* pClient */ ,
-                      pointer   /* closure */
+                      void *    /* closure */
         );
     ClientPtr client;
-    pointer closure;
+    void *closure;
 } WorkQueueRec;
 
 extern _X_EXPORT TimeStamp currentTime;
@@ -166,7 +166,7 @@ ClientTimeToServerTime(CARD32 /*c */ );
 
 typedef struct _CallbackRec {
     CallbackProcPtr proc;
-    pointer data;
+    void *data;
     Bool deleted;
     struct _CallbackRec *next;
 } CallbackRec, *CallbackPtr;
-- 
cgit v1.2.3