aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/dix.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-06-22 09:36:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 12:54:40 +0100
commit68dd0b52e13c844d662192654fb10cb993257a59 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/include/dix.h
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
downloadnx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip
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> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/include/dix.h')
-rw-r--r--nx-X11/programs/Xserver/include/dix.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h
index 9fe575e53..25260e46c 100644
--- a/nx-X11/programs/Xserver/include/dix.h
+++ b/nx-X11/programs/Xserver/include/dix.h
@@ -330,7 +330,7 @@ extern void InitSelections(void);
extern void FlushClientCaches(XID /*id*/);
extern int dixDestroyPixmap(
- pointer /*value*/,
+ void * /*value*/,
XID /*pid*/);
extern void CloseDownRetainedResources(void);
@@ -338,10 +338,10 @@ extern void CloseDownRetainedResources(void);
extern void InitClient(
ClientPtr /*client*/,
int /*i*/,
- pointer /*ospriv*/);
+ void * /*ospriv*/);
extern ClientPtr NextAvailableClient(
- pointer /*ospriv*/);
+ void * /*ospriv*/);
extern void SendErrorToClient(
ClientPtr /*client*/,
@@ -403,7 +403,7 @@ extern WindowPtr SecurityLookupWindow(
ClientPtr /*client*/,
Mask /*access_mode*/);
-extern pointer SecurityLookupDrawable(
+extern void * SecurityLookupDrawable(
XID /*rid*/,
ClientPtr /*client*/,
Mask /*access_mode*/);
@@ -412,7 +412,7 @@ extern WindowPtr LookupWindow(
XID /*rid*/,
ClientPtr /*client*/);
-extern pointer LookupDrawable(
+extern void * LookupDrawable(
XID /*rid*/,
ClientPtr /*client*/);
@@ -422,7 +422,7 @@ extern WindowPtr LookupWindow(
XID /*rid*/,
ClientPtr /*client*/);
-extern pointer LookupDrawable(
+extern void * LookupDrawable(
XID /*rid*/,
ClientPtr /*client*/);
@@ -451,27 +451,27 @@ extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/);
extern void BlockHandler(
- pointer /*pTimeout*/,
- pointer /*pReadmask*/);
+ void * /*pTimeout*/,
+ void * /*pReadmask*/);
extern void WakeupHandler(
int /*result*/,
- pointer /*pReadmask*/);
+ void * /*pReadmask*/);
typedef void (* WakeupHandlerProcPtr)(
- pointer /* blockData */,
+ void * /* blockData */,
int /* result */,
- pointer /* pReadmask */);
+ void * /* pReadmask */);
extern Bool RegisterBlockAndWakeupHandlers(
BlockHandlerProcPtr /*blockHandler*/,
WakeupHandlerProcPtr /*wakeupHandler*/,
- pointer /*blockData*/);
+ void * /*blockData*/);
extern void RemoveBlockAndWakeupHandlers(
BlockHandlerProcPtr /*blockHandler*/,
WakeupHandlerProcPtr /*wakeupHandler*/,
- pointer /*blockData*/);
+ void * /*blockData*/);
extern void InitBlockAndWakeupHandlers(void);
@@ -482,19 +482,19 @@ extern void ProcessWorkQueueZombies(void);
extern Bool QueueWorkProc(
Bool (* /*function*/)(
ClientPtr /*clientUnused*/,
- pointer /*closure*/),
+ void * /*closure*/),
ClientPtr /*client*/,
- pointer /*closure*/
+ void * /*closure*/
);
typedef Bool (* ClientSleepProcPtr)(
ClientPtr /*client*/,
- pointer /*closure*/);
+ void * /*closure*/);
extern Bool ClientSleep(
ClientPtr /*client*/,
ClientSleepProcPtr /* function */,
- pointer /*closure*/);
+ void * /*closure*/);
#ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___
@@ -634,7 +634,7 @@ extern void RecalculateDeliverableEvents(
WindowPtr /* pWin */);
extern int OtherClientGone(
- pointer /* value */,
+ void * /* value */,
XID /* id */);
extern void DoFocusEvents(
@@ -723,16 +723,16 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
#endif
typedef void (*CallbackProcPtr) (
- CallbackListPtr *, pointer, pointer);
+ CallbackListPtr *, void *, void *);
typedef Bool (*AddCallbackProcPtr) (
- CallbackListPtr *, CallbackProcPtr, pointer);
+ CallbackListPtr *, CallbackProcPtr, void *);
typedef Bool (*DeleteCallbackProcPtr) (
- CallbackListPtr *, CallbackProcPtr, pointer);
+ CallbackListPtr *, CallbackProcPtr, void *);
typedef void (*CallCallbacksProcPtr) (
- CallbackListPtr *, pointer);
+ CallbackListPtr *, void *);
typedef void (*DeleteCallbackListProcPtr) (
CallbackListPtr *);
@@ -751,16 +751,16 @@ extern Bool CreateCallbackList(
extern Bool AddCallback(
CallbackListPtr * /*pcbl*/,
CallbackProcPtr /*callback*/,
- pointer /*data*/);
+ void * /*data*/);
extern Bool DeleteCallback(
CallbackListPtr * /*pcbl*/,
CallbackProcPtr /*callback*/,
- pointer /*data*/);
+ void * /*data*/);
extern void CallCallbacks(
CallbackListPtr * /*pcbl*/,
- pointer /*call_data*/);
+ void * /*call_data*/);
extern void DeleteCallbackList(
CallbackListPtr * /*pcbl*/);