diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
| commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
| tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /test | |
| parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) | |
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/xi2/protocol-common.c | 2 | ||||
| -rw-r--r-- | test/xi2/protocol-common.h | 2 | ||||
| -rw-r--r-- | test/xi2/protocol-xigetselectedevents.c | 2 | ||||
| -rw-r--r-- | test/xtest.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c index 0947898f0..e171115d3 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -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(); diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h index f27f248c6..d30306886 100644 --- a/test/xi2/protocol-common.h +++ b/test/xi2/protocol-common.h @@ -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); diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index fc33aa554..bedc217b1 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -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; } diff --git a/test/xtest.c b/test/xtest.c index e5e5241b7..e9fabfbb9 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -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(); |