aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
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
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')
-rw-r--r--nx-X11/include/Xdefs.h4
-rw-r--r--nx-X11/include/extensions/XKBsrv.h6
-rw-r--r--nx-X11/include/extensions/lbxopts.h4
-rw-r--r--nx-X11/include/extensions/syncstr.h12
-rw-r--r--nx-X11/include/extensions/xtrapproto.h2
5 files changed, 14 insertions, 14 deletions
diff --git a/nx-X11/include/Xdefs.h b/nx-X11/include/Xdefs.h
index 9e77e30b8..f32149db5 100644
--- a/nx-X11/include/Xdefs.h
+++ b/nx-X11/include/Xdefs.h
@@ -103,8 +103,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
diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h
index 4a9d8edcb..0d262e979 100644
--- a/nx-X11/include/extensions/XKBsrv.h
+++ b/nx-X11/include/extensions/XKBsrv.h
@@ -294,7 +294,7 @@ extern char * XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed;
extern Bool noXkbExtension;
extern Bool XkbWantRulesProp;
-extern pointer XkbLastRepeatEvent;
+extern void * XkbLastRepeatEvent;
extern CARD32 xkbDebugFlags;
extern CARD32 xkbDebugCtrls;
@@ -336,7 +336,7 @@ extern int DeviceButtonPress,DeviceButtonRelease;
#define IsKeypadKey(s) XkbKSIsKeypad(s)
#define Status int
-#define XPointer pointer
+#define XPointer void *
#define Display struct _XDisplay
#ifndef True
@@ -715,7 +715,7 @@ extern void XkbHandleBell(
BOOL /* eventOnly */,
DeviceIntPtr /* kbd */,
CARD8 /* percent */,
- pointer /* ctrl */,
+ void * /* ctrl */,
CARD8 /* class */,
Atom /* name */,
WindowPtr /* pWin */,
diff --git a/nx-X11/include/extensions/lbxopts.h b/nx-X11/include/extensions/lbxopts.h
index ac1e12121..3ec81fcb2 100644
--- a/nx-X11/include/extensions/lbxopts.h
+++ b/nx-X11/include/extensions/lbxopts.h
@@ -96,8 +96,8 @@ struct iovec {
typedef void *LbxStreamCompHandle;
typedef struct _LbxStreamOpts {
- LbxStreamCompHandle (*streamCompInit)(int fd, pointer arg);
- pointer streamCompArg;
+ LbxStreamCompHandle (*streamCompInit)(int fd, void * arg);
+ void * streamCompArg;
int (*streamCompStuffInput)(
int fd,
unsigned char *buf,
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);
diff --git a/nx-X11/include/extensions/xtrapproto.h b/nx-X11/include/extensions/xtrapproto.h
index b3e29cfaa..7eb8f9d47 100644
--- a/nx-X11/include/extensions/xtrapproto.h
+++ b/nx-X11/include/extensions/xtrapproto.h
@@ -44,7 +44,7 @@ SOFTWARE.
# define Bool int
#endif
/* xtrapdi.c */
-int XETrapDestroyEnv (pointer value , XID id );
+int XETrapDestroyEnv (void * value , XID id );
void XETrapCloseDown ( ExtensionEntry *extEntry );
Bool XETrapRedirectDevices (void );
void DEC_XTRAPInit (void );