aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/dixstruct.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/programs/Xserver/include/dixstruct.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/programs/Xserver/include/dixstruct.h')
-rw-r--r--nx-X11/programs/Xserver/include/dixstruct.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h
index 6266ec9f8..53c78d2de 100644
--- a/nx-X11/programs/Xserver/include/dixstruct.h
+++ b/nx-X11/programs/Xserver/include/dixstruct.h
@@ -93,8 +93,8 @@ typedef struct _Window *SaveSetElt;
typedef struct _Client {
int index;
Mask clientAsMask;
- pointer requestBuffer;
- pointer osPrivate; /* for OS layer, including scheduler */
+ void *requestBuffer;
+ void *osPrivate; /* for OS layer, including scheduler */
Bool swapped;
ReplySwapPtr pSwapReplyFunc;
XID errorValue;
@@ -109,7 +109,7 @@ typedef struct _Client {
GContext lastGCID;
SaveSetElt *saveSet;
int numSaved;
- pointer screenPrivate[MAXSCREENS];
+ void *screenPrivate[MAXSCREENS];
int (**requestVector) (
ClientPtr /* pClient */);
CARD32 req_len; /* length of current request */
@@ -136,12 +136,12 @@ typedef struct _Client {
#ifdef XCSECURITY
XID authId;
unsigned int trustLevel;
- pointer (* CheckAccess)(
+ void * (* CheckAccess)(
ClientPtr /*pClient*/,
XID /*id*/,
RESTYPE /*classes*/,
Mask /*access_mode*/,
- pointer /*resourceval*/);
+ void * /*resourceval*/);
#endif
#ifdef XAPPGROUP
struct _AppGroupRec* appgroup;
@@ -187,10 +187,10 @@ typedef struct _WorkQueue {
struct _WorkQueue *next;
Bool (*function) (
ClientPtr /* pClient */,
- pointer /* closure */
+ void * /* closure */
);
ClientPtr client;
- pointer closure;
+ void *closure;
} WorkQueueRec;
extern TimeStamp currentTime;
@@ -204,7 +204,7 @@ extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
typedef struct _CallbackRec {
CallbackProcPtr proc;
- pointer data;
+ void * data;
Bool deleted;
struct _CallbackRec *next;
} CallbackRec, *CallbackPtr;