summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-15 08:27:09 -0800
committerBoram Park <boram1288.park@samsung.com>2014-04-11 14:17:15 +0900
commit5804eff5cb5ef1ee692d9df817bcb52f77763fa4 (patch)
tree362c323129ca70f25c6a5deae5468176b8ed64cd
parent8261f26e8f17f1ba7f91bd7e3f5ac2fad80a2f81 (diff)
downloadxproto-5804eff5cb5ef1ee692d9df817bcb52f77763fa4.tar.gz
xproto-5804eff5cb5ef1ee692d9df817bcb52f77763fa4.tar.bz2
xproto-5804eff5cb5ef1ee692d9df817bcb52f77763fa4.zip
Replace 'pointer' with explicit 'void *'submit/devel/upgrade/20140416.113700devel/upgrade
To get rid of the 'pointer' typedef, stop using it locally. That way, when _XTYPEDEF_POINTER is defined before Xdefs.h is included, it won't get defined and Xdefs.h will still compile. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Xdefs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Xdefs.h b/Xdefs.h
index 46ffdad..e25a208 100644
--- a/Xdefs.h
+++ b/Xdefs.h
@@ -101,8 +101,8 @@ typedef FSID AccContext;
typedef struct timeval **OSTimePtr;
-typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
+typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
OSTimePtr /* pTimeout */,
- pointer /* pReadmask */);
+ void * /* pReadmask */);
#endif