From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard 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 Reviewed-by: Eric Anholt Rebased against NX: Mike Gabriel --- nx-X11/include/extensions/syncstr.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nx-X11/include/extensions/syncstr.h') diff --git a/nx-X11/include/extensions/syncstr.h b/nx-X11/include/extensions/syncstr.h index 4e384f22e..10ca9188a 100644 --- a/nx-X11/include/extensions/syncstr.h +++ b/nx-X11/include/extensions/syncstr.h @@ -396,11 +396,11 @@ typedef struct _SysCounterInfo { CARD64 bracket_less; SyncCounterType counterType; /* how can this counter change */ void (*QueryValue)( - pointer /*pCounter*/, + void * /*pCounter*/, CARD64 * /*freshvalue*/ ); void (*BracketValues)( - pointer /*pCounter*/, + void * /*pCounter*/, CARD64 * /*lessthan*/, CARD64 * /*greaterthan*/ ); @@ -465,16 +465,16 @@ typedef union { } SyncAwaitUnion; -extern pointer SyncCreateSystemCounter( +extern void * SyncCreateSystemCounter( char * /* name */, CARD64 /* inital_value */, CARD64 /* resolution */, SyncCounterType /* change characterization */, void (* /*QueryValue*/ ) ( - pointer /* pCounter */, + void * /* pCounter */, CARD64 * /* pValue_return */), /* XXX prototype */ void (* /*BracketValues*/) ( - pointer /* pCounter */, + void * /* pCounter */, CARD64 * /* pbracket_less */, CARD64 * /* pbracket_greater */) ); @@ -485,7 +485,7 @@ extern void SyncChangeCounter( ); extern void SyncDestroySystemCounter( - pointer pCounter + void * pCounter ); extern void InitServertime(void); -- cgit v1.2.3