aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/randr/rrproviderproperty.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/randr/rrproviderproperty.c')
-rw-r--r--xorg-server/randr/rrproviderproperty.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/randr/rrproviderproperty.c b/xorg-server/randr/rrproviderproperty.c
index be54f259e..7955423e5 100644
--- a/xorg-server/randr/rrproviderproperty.c
+++ b/xorg-server/randr/rrproviderproperty.c
@@ -30,7 +30,7 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
xRRProviderPropertyNotifyEvent *event = value;
RREventPtr *pHead, pRREvent;
- dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, serverClient, DixReadAccess);
if (!pHead)
return WT_WALKCHILDREN;
@@ -135,7 +135,7 @@ RRDeleteProviderProperty(RRProviderPtr provider, Atom property)
int
RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending)
+ void *value, Bool sendevent, Bool pending)
{
RRPropertyPtr prop;
rrScrPrivPtr pScrPriv = rrGetScrPriv(provider->pScreen);
@@ -178,10 +178,10 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
total_len = prop_value->size + len;
if (mode == PropModeReplace || len > 0) {
- pointer new_data = NULL, old_data = NULL;
+ void *new_data = NULL, *old_data = NULL;
total_size = total_len * size_in_bytes;
- new_value.data = (pointer) malloc(total_size);
+ new_value.data = (void *) malloc(total_size);
if (!new_value.data && total_size) {
if (add)
RRDestroyProviderProperty(prop);
@@ -197,13 +197,13 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
old_data = NULL;
break;
case PropModeAppend:
- new_data = (pointer) (((char *) new_value.data) +
+ new_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
old_data = new_value.data;
break;
case PropModePrepend:
new_data = new_value.data;
- old_data = (pointer) (((char *) new_value.data) +
+ old_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
break;
}
@@ -534,7 +534,7 @@ ProcRRChangeProviderProperty(ClientPtr client)
err = RRChangeProviderProperty(provider, stuff->property,
stuff->type, (int) format,
- (int) mode, len, (pointer) &stuff[1], TRUE,
+ (int) mode, len, (void *) &stuff[1], TRUE,
TRUE);
if (err != Success)
return err;