XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'pointer' type with 'void *'

Browse Source 
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard
2013-12-15 01:05:51 -08:00
parent 93fa64e17d
commit 60014a4a98
319 changed files with 1916 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
present/present.c
View File

@@ -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;

6
present/present_event.c
View File

@@ -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;
}
@@ -229,7 +229,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;

2
present/present_fake.c
View File

@@ -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;

2
present/present_request.c
View File

@@ -89,7 +89,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;