aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include/extensions/syncstr.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/include/extensions/syncstr.h
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/include/extensions/syncstr.h')
-rw-r--r--nx-X11/include/extensions/syncstr.h12
1 files changed, 6 insertions, 6 deletions
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);