On 12/15/13 08:29 AM, Keith Packard wrote:
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 <kei...@keithp.com>
---
  Xdefs.h | 4 ++--
  1 file 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


Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>

Though I wonder if these typedefs should get moved from x11proto to
the xserver headers someday.

--
        -Alan Coopersmith-              alan.coopersm...@oracle.com
         Oracle Solaris Engineering - http://blogs.oracle.com/alanc
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to