aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/present
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/present')
-rw-r--r--xorg-server/present/present.c2
-rw-r--r--xorg-server/present/present_event.c6
-rw-r--r--xorg-server/present/present_fake.c2
-rw-r--r--xorg-server/present/present_request.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/present/present.c b/xorg-server/present/present.c
index 638bfb965..1bb459592 100644
--- a/xorg-server/present/present.c
+++ b/xorg-server/present/present.c
@@ -318,7 +318,7 @@ struct pixmap_visit {
};
static int
-present_set_tree_pixmap_visit(WindowPtr window, pointer data)
+present_set_tree_pixmap_visit(WindowPtr window, void *data)
{
struct pixmap_visit *visit = data;
ScreenPtr screen = window->drawable.pScreen;
diff --git a/xorg-server/present/present_event.c b/xorg-server/present/present_event.c
index 3d0aaa799..5582e51a6 100644
--- a/xorg-server/present/present_event.c
+++ b/xorg-server/present/present_event.c
@@ -29,7 +29,7 @@
RESTYPE present_event_type;
static int
-present_free_event(pointer data, XID id)
+present_free_event(void *data, XID id)
{
present_event_ptr present_event = (present_event_ptr) data;
present_window_priv_ptr window_priv = present_window_priv(present_event->window);
@@ -41,7 +41,7 @@ present_free_event(pointer data, XID id)
break;
}
}
- free((pointer) present_event);
+ free((void *) present_event);
return 1;
}
@@ -226,7 +226,7 @@ present_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask)
event->next = window_priv->events;
window_priv->events = event;
- if (!AddResource(event->id, present_event_type, (pointer) event))
+ if (!AddResource(event->id, present_event_type, (void *) event))
return BadAlloc;
return Success;
diff --git a/xorg-server/present/present_fake.c b/xorg-server/present/present_fake.c
index 7926f7a4c..1c80f5986 100644
--- a/xorg-server/present/present_fake.c
+++ b/xorg-server/present/present_fake.c
@@ -58,7 +58,7 @@ present_fake_notify(ScreenPtr screen, uint64_t event_id)
static CARD32
present_fake_do_timer(OsTimerPtr timer,
CARD32 time,
- pointer arg)
+ void *arg)
{
present_fake_vblank_ptr fake_vblank = arg;
diff --git a/xorg-server/present/present_request.c b/xorg-server/present/present_request.c
index 275a29cdc..c69e68309 100644
--- a/xorg-server/present/present_request.c
+++ b/xorg-server/present/present_request.c
@@ -90,7 +90,7 @@ proc_present_pixmap(ClientPtr client)
ret = dixLookupWindow(&window, stuff->window, client, DixWriteAccess);
if (ret != Success)
return ret;
- ret = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixReadAccess);
+ ret = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixReadAccess);
if (ret != Success)
return ret;