aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/randrstr.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/randr/randrstr.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/randr/randrstr.h')
-rw-r--r--nx-X11/programs/Xserver/randr/randrstr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h
index 52067b51e..3c3db2c13 100644
--- a/nx-X11/programs/Xserver/randr/randrstr.h
+++ b/nx-X11/programs/Xserver/randr/randrstr.h
@@ -91,7 +91,7 @@ struct _rrPropertyValue {
Atom type; /* ignored by server */
short format; /* format of data for swapping - 8,16,32 */
long size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
};
struct _rrProperty {
@@ -283,7 +283,7 @@ extern int rrPrivIndex;
#define rrGetScrPriv(pScr) ((rrScrPrivPtr) (pScr)->devPrivates[rrPrivIndex].ptr)
#define rrScrPriv(pScr) rrScrPrivPtr pScrPriv = rrGetScrPriv(pScr)
-#define SetRRScreen(s,p) ((s)->devPrivates[rrPrivIndex].ptr = (pointer) (p))
+#define SetRRScreen(s,p) ((s)->devPrivates[rrPrivIndex].ptr = (void *) (p))
#endif
@@ -785,7 +785,7 @@ RRPostPendingProperties (RROutputPtr output);
int
RRChangeOutputProperty (RROutputPtr output, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending);
+ void * value, Bool sendevent, Bool pending);
int
RRConfigureOutputProperty (RROutputPtr output, Atom property,