Replace 'pointer' type with 'void *'

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

View File

@@ -251,7 +251,7 @@ init_simple(void)
init_window(&window, &root, CLIENT_WINDOW_ID);
serverClient = &server_client;
InitClient(serverClient, 0, (pointer) NULL);
InitClient(serverClient, 0, (void *) NULL);
if (!InitClientResources(serverClient)) /* for root resources */
FatalError("couldn't init server resources");
SyncExtensionInit();

View File

@@ -148,7 +148,7 @@ int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,
Mask access);
int __real_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,
Mask access);
Bool __wrap_AddResource(XID id, RESTYPE type, pointer value);
Bool __wrap_AddResource(XID id, RESTYPE type, void *value);
int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);

View File

@@ -82,7 +82,7 @@ __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
/* AddResource is called from XISetSEventMask, we don't need this */
Bool
__wrap_AddResource(XID id, RESTYPE type, pointer value)
__wrap_AddResource(XID id, RESTYPE type, void *value)
{
return TRUE;
}

View File

@@ -71,7 +71,7 @@ xtest_init_devices(void)
screen.DeviceCursorCleanup = device_cursor_cleanup;
dixResetPrivates();
serverClient = &server_client;
InitClient(serverClient, 0, (pointer) NULL);
InitClient(serverClient, 0, (void *) NULL);
if (!InitClientResources(serverClient)) /* for root resources */
FatalError("couldn't init server resources");
InitAtoms();