diff options
Diffstat (limited to 'syncstr.h')
| -rw-r--r-- | syncstr.h | 33 |
1 files changed, 14 insertions, 19 deletions
@@ -48,6 +48,10 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/include/extensions/syncstr.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ + +#ifndef _SYNCSTR_H_ +#define _SYNCSTR_H_ #include "sync.h" @@ -392,17 +396,13 @@ typedef struct _SysCounterInfo { CARD64 bracket_less; SyncCounterType counterType; /* how can this counter change */ void (*QueryValue)( -#if NeedNestedPrototypes pointer /*pCounter*/, CARD64 * /*freshvalue*/ -#endif ); void (*BracketValues)( -#if NeedNestedPrototypes pointer /*pCounter*/, CARD64 * /*lessthan*/, CARD64 * /*greaterthan*/ -#endif ); } SysCounterInfo; @@ -415,20 +415,14 @@ typedef struct _SyncTrigger { unsigned int test_type; /* transition or Comparision type */ CARD64 test_value; /* trigger event threshold value */ Bool (*CheckTrigger)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/, CARD64 /*newval*/ -#endif ); void (*TriggerFired)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/ -#endif ); void (*CounterDestroyed)( -#if NeedNestedPrototypes struct _SyncTrigger * /*pTrigger*/ -#endif ); } SyncTrigger; @@ -472,28 +466,29 @@ typedef union { extern pointer SyncCreateSystemCounter( -#if NeedFunctionPrototypes char * /* name */, CARD64 /* inital_value */, CARD64 /* resolution */, SyncCounterType /* change characterization */, - void (* /*QueryValue*/ ) (), /* XXX prototype */ - void (* /*BracketValues*/) () -#endif + void (* /*QueryValue*/ ) ( + pointer /* pCounter */, + CARD64 * /* pValue_return */), /* XXX prototype */ + void (* /*BracketValues*/) ( + pointer /* pCounter */, + CARD64 * /* pbracket_less */, + CARD64 * /* pbracket_greater */) ); extern void SyncChangeCounter( -#if NeedFunctionPrototypes SyncCounter * /* pCounter*/, CARD64 /* new_value */ -#endif ); extern void SyncDestroySystemCounter( -#if NeedFunctionPrototypes pointer pCounter -#endif ); -extern void InitServertime(); +extern void InitServertime(void); #endif /* _SYNC_SERVER */ + +#endif /* _SYNCSTR_H_ */ |