aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/include
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/include')
-rw-r--r--nx-X11/programs/Xserver/include/closestr.h2
-rw-r--r--nx-X11/programs/Xserver/include/colormap.h8
-rw-r--r--nx-X11/programs/Xserver/include/colormapst.h2
-rw-r--r--nx-X11/programs/Xserver/include/cursor.h2
-rw-r--r--nx-X11/programs/Xserver/include/cursorstr.h4
-rw-r--r--nx-X11/programs/Xserver/include/dix.h50
-rw-r--r--nx-X11/programs/Xserver/include/dixfont.h6
-rw-r--r--nx-X11/programs/Xserver/include/dixgrabs.h2
-rw-r--r--nx-X11/programs/Xserver/include/dixstruct.h16
-rw-r--r--nx-X11/programs/Xserver/include/extnsionst.h2
-rw-r--r--nx-X11/programs/Xserver/include/gc.h10
-rw-r--r--nx-X11/programs/Xserver/include/gcstruct.h8
-rw-r--r--nx-X11/programs/Xserver/include/input.h4
-rw-r--r--nx-X11/programs/Xserver/include/misc.h5
-rw-r--r--nx-X11/programs/Xserver/include/miscstruct.h2
-rw-r--r--nx-X11/programs/Xserver/include/os.h56
-rw-r--r--nx-X11/programs/Xserver/include/pixmap.h2
-rw-r--r--nx-X11/programs/Xserver/include/property.h2
-rw-r--r--nx-X11/programs/Xserver/include/propertyst.h2
-rw-r--r--nx-X11/programs/Xserver/include/resource.h34
-rw-r--r--nx-X11/programs/Xserver/include/scrnintstr.h22
-rw-r--r--nx-X11/programs/Xserver/include/window.h8
-rw-r--r--nx-X11/programs/Xserver/include/windowstr.h2
23 files changed, 131 insertions, 120 deletions
diff --git a/nx-X11/programs/Xserver/include/closestr.h b/nx-X11/programs/Xserver/include/closestr.h
index d70f754b2..c06010113 100644
--- a/nx-X11/programs/Xserver/include/closestr.h
+++ b/nx-X11/programs/Xserver/include/closestr.h
@@ -69,7 +69,7 @@ typedef struct _LFWIstate {
int current_fpe;
int max_names;
Bool list_started;
- pointer private;
+ void * private;
} LFWIstateRec, *LFWIstatePtr;
typedef struct _LFWIclosure {
diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h
index 1f2c33075..d519bb782 100644
--- a/nx-X11/programs/Xserver/include/colormap.h
+++ b/nx-X11/programs/Xserver/include/colormap.h
@@ -87,16 +87,16 @@ extern int CreateColormap(
int /*client*/);
extern int FreeColormap(
- pointer /*pmap*/,
+ void * /*pmap*/,
XID /*mid*/);
extern int TellLostMap(
WindowPtr /*pwin*/,
- pointer /* Colormap *pmid */);
+ void * /* Colormap *pmid */);
extern int TellGainedMap(
WindowPtr /*pwin*/,
- pointer /* Colormap *pmid */);
+ void * /* Colormap *pmid */);
extern int CopyColormapAndFree(
Colormap /*mid*/,
@@ -140,7 +140,7 @@ extern int QueryColors(
xrgb* /*prgbList*/);
extern int FreeClientPixels(
- pointer /*pcr*/,
+ void * /*pcr*/,
XID /*fakeid*/);
extern int AllocColorCells(
diff --git a/nx-X11/programs/Xserver/include/colormapst.h b/nx-X11/programs/Xserver/include/colormapst.h
index 5ceee9870..6b52b8350 100644
--- a/nx-X11/programs/Xserver/include/colormapst.h
+++ b/nx-X11/programs/Xserver/include/colormapst.h
@@ -113,7 +113,7 @@ typedef struct _ColormapRec
Entry *red;
Entry *green;
Entry *blue;
- pointer devPriv;
+ void * devPriv;
DevUnion *devPrivates; /* dynamic devPrivates added after devPriv
already existed - must keep devPriv */
} ColormapRec;
diff --git a/nx-X11/programs/Xserver/include/cursor.h b/nx-X11/programs/Xserver/include/cursor.h
index 9eb799e1c..9e760df02 100644
--- a/nx-X11/programs/Xserver/include/cursor.h
+++ b/nx-X11/programs/Xserver/include/cursor.h
@@ -68,7 +68,7 @@ typedef struct _CursorMetric *CursorMetricPtr;
extern CursorPtr rootCursor;
extern int FreeCursor(
- pointer /*pCurs*/,
+ void * /*pCurs*/,
XID /*cid*/);
/* Quartz support on Mac OS X pulls in the QuickDraw
diff --git a/nx-X11/programs/Xserver/include/cursorstr.h b/nx-X11/programs/Xserver/include/cursorstr.h
index c877d6cc9..894467289 100644
--- a/nx-X11/programs/Xserver/include/cursorstr.h
+++ b/nx-X11/programs/Xserver/include/cursorstr.h
@@ -65,7 +65,7 @@ typedef struct _CursorBits {
Bool emptyMask; /* all zeros mask */
unsigned short width, height, xhot, yhot; /* metrics */
int refcnt; /* can be shared */
- pointer devPriv[MAXSCREENS]; /* set by pScr->RealizeCursor*/
+ void * devPriv[MAXSCREENS]; /* set by pScr->RealizeCursor*/
#ifdef ARGB_CURSOR
CARD32 *argb; /* full-color alpha blended */
#endif
@@ -76,7 +76,7 @@ typedef struct _Cursor {
unsigned short foreRed, foreGreen, foreBlue; /* device-independent color */
unsigned short backRed, backGreen, backBlue; /* device-independent color */
int refcnt;
- pointer devPriv[MAXSCREENS]; /* set by pScr->RealizeCursor*/
+ void * devPriv[MAXSCREENS]; /* set by pScr->RealizeCursor*/
#ifdef XFIXES
CARD32 serialNumber;
Atom name;
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*/);
diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h
index c6b8676da..9fcf0d585 100644
--- a/nx-X11/programs/Xserver/include/dixfont.h
+++ b/nx-X11/programs/Xserver/include/dixfont.h
@@ -45,9 +45,9 @@ extern void QueueFontWakeup(FontPathElementPtr /*fpe*/);
extern void RemoveFontWakeup(FontPathElementPtr /*fpe*/);
-extern void FontWakeup(pointer /*data*/,
+extern void FontWakeup(void * /*data*/,
int /*count*/,
- pointer /*LastSelectMask*/);
+ void * /*LastSelectMask*/);
extern int OpenFont(ClientPtr /*client*/,
XID /*fid*/,
@@ -55,7 +55,7 @@ extern int OpenFont(ClientPtr /*client*/,
unsigned /*lenfname*/,
char * /*pfontname*/);
-extern int CloseFont(pointer /*pfont*/,
+extern int CloseFont(void * /*pfont*/,
XID /*fid*/);
typedef struct _xQueryFontReply *xQueryFontReplyPtr;
diff --git a/nx-X11/programs/Xserver/include/dixgrabs.h b/nx-X11/programs/Xserver/include/dixgrabs.h
index 042e063db..c05447c71 100644
--- a/nx-X11/programs/Xserver/include/dixgrabs.h
+++ b/nx-X11/programs/Xserver/include/dixgrabs.h
@@ -43,7 +43,7 @@ extern GrabPtr CreateGrab(
CursorPtr /* cursor */);
extern int DeletePassiveGrab(
- pointer /* value */,
+ void * /* value */,
XID /* id */);
extern Bool GrabMatchesSecond(
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h
index 6266ec9f8..53c78d2de 100644
--- a/nx-X11/programs/Xserver/include/dixstruct.h
+++ b/nx-X11/programs/Xserver/include/dixstruct.h
@@ -93,8 +93,8 @@ typedef struct _Window *SaveSetElt;
typedef struct _Client {
int index;
Mask clientAsMask;
- pointer requestBuffer;
- pointer osPrivate; /* for OS layer, including scheduler */
+ void *requestBuffer;
+ void *osPrivate; /* for OS layer, including scheduler */
Bool swapped;
ReplySwapPtr pSwapReplyFunc;
XID errorValue;
@@ -109,7 +109,7 @@ typedef struct _Client {
GContext lastGCID;
SaveSetElt *saveSet;
int numSaved;
- pointer screenPrivate[MAXSCREENS];
+ void *screenPrivate[MAXSCREENS];
int (**requestVector) (
ClientPtr /* pClient */);
CARD32 req_len; /* length of current request */
@@ -136,12 +136,12 @@ typedef struct _Client {
#ifdef XCSECURITY
XID authId;
unsigned int trustLevel;
- pointer (* CheckAccess)(
+ void * (* CheckAccess)(
ClientPtr /*pClient*/,
XID /*id*/,
RESTYPE /*classes*/,
Mask /*access_mode*/,
- pointer /*resourceval*/);
+ void * /*resourceval*/);
#endif
#ifdef XAPPGROUP
struct _AppGroupRec* appgroup;
@@ -187,10 +187,10 @@ typedef struct _WorkQueue {
struct _WorkQueue *next;
Bool (*function) (
ClientPtr /* pClient */,
- pointer /* closure */
+ void * /* closure */
);
ClientPtr client;
- pointer closure;
+ void *closure;
} WorkQueueRec;
extern TimeStamp currentTime;
@@ -204,7 +204,7 @@ extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
typedef struct _CallbackRec {
CallbackProcPtr proc;
- pointer data;
+ void * data;
Bool deleted;
struct _CallbackRec *next;
} CallbackRec, *CallbackPtr;
diff --git a/nx-X11/programs/Xserver/include/extnsionst.h b/nx-X11/programs/Xserver/include/extnsionst.h
index daf37bf43..218ce8a7a 100644
--- a/nx-X11/programs/Xserver/include/extnsionst.h
+++ b/nx-X11/programs/Xserver/include/extnsionst.h
@@ -67,7 +67,7 @@ typedef struct _ExtensionEntry {
int errorLast;
int num_aliases;
char **aliases;
- pointer extPrivate;
+ void * extPrivate;
unsigned short (* MinorOpcode)( /* called for errors */
ClientPtr /* client */);
#ifdef XCSECURITY
diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h
index 77c2f20c6..1c0c90d3e 100644
--- a/nx-X11/programs/Xserver/include/gc.h
+++ b/nx-X11/programs/Xserver/include/gc.h
@@ -51,7 +51,13 @@ SOFTWARE.
#define GC_H
#include <X11/X.h> /* for GContext, Mask */
+
+#ifndef _XTYPEDEF_POINTER
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER 1
+#endif /* _XTYPEDEF_POINTER */
#include <X11/Xdefs.h> /* for Bool */
+
#include <X11/Xproto.h>
#include "screenint.h" /* for ScreenPtr */
#include "pixmap.h" /* for DrawablePtr */
@@ -103,7 +109,7 @@ extern int DoChangeGC(
typedef union {
CARD32 val;
- pointer ptr;
+ void * ptr;
} ChangeGCVal, *ChangeGCValPtr;
extern int dixChangeGC(
@@ -125,7 +131,7 @@ extern int CopyGC(
BITS32 /*mask*/);
extern int FreeGC(
- pointer /*pGC*/,
+ void * /*pGC*/,
XID /*gid*/);
extern void SetGCMask(
diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h
index c2226ba17..16779f692 100644
--- a/nx-X11/programs/Xserver/include/gcstruct.h
+++ b/nx-X11/programs/Xserver/include/gcstruct.h
@@ -85,7 +85,7 @@ typedef struct _GCFuncs {
void (* ChangeClip)(
GCPtr /*pGC*/,
int /*type*/,
- pointer /*pvalue*/,
+ void * /*pvalue*/,
int /*nrects*/);
void (* DestroyClip)(
@@ -244,7 +244,7 @@ typedef struct _GCOps {
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/);
+ void * /*pglyphBase*/);
void (* PolyGlyphBlt)(
DrawablePtr /*pDrawable*/,
@@ -253,7 +253,7 @@ typedef struct _GCOps {
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/);
+ void * /*pglyphBase*/);
void (* PushPixels)(
GCPtr /*pGC*/,
@@ -309,7 +309,7 @@ typedef struct _GC {
struct _Font *font;
DDXPointRec clipOrg;
DDXPointRec lastWinOrg; /* position of window last validated */
- pointer clientClip;
+ void * clientClip;
unsigned long stateChanges; /* masked with GC_<kind> */
unsigned long serialNumber;
GCFuncs *funcs;
diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h
index bcaa01e6f..88cc98050 100644
--- a/nx-X11/programs/Xserver/include/input.h
+++ b/nx-X11/programs/Xserver/include/input.h
@@ -104,7 +104,7 @@ typedef void (*DeviceUnwrapProc)(
);
typedef struct _DeviceRec {
- pointer devicePrivate;
+ void * devicePrivate;
ProcessInputProc processInputProc; /* current */
ProcessInputProc realInputProc; /* deliver */
ProcessInputProc enqueueInputProc; /* enqueue */
@@ -255,7 +255,7 @@ extern Bool InitFocusClassDeviceStruct(
typedef void (*BellProcPtr)(
int /*percent*/,
DeviceIntPtr /*device*/,
- pointer /*ctrl*/,
+ void * /*ctrl*/,
int);
typedef void (*KbdCtrlProcPtr)(
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 849f1b5cc..1576f1433 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -81,6 +81,11 @@ extern unsigned long serverGeneration;
#include <X11/Xfuncproto.h>
#include <X11/Xmd.h>
#include <X11/X.h>
+
+#ifndef _XTYPEDEF_POINTER
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER 1
+#endif /* _XTYPEDEF_POINTER */
#include <X11/Xdefs.h>
#ifndef IN_MODULE
diff --git a/nx-X11/programs/Xserver/include/miscstruct.h b/nx-X11/programs/Xserver/include/miscstruct.h
index 6a16007b7..87874aae4 100644
--- a/nx-X11/programs/Xserver/include/miscstruct.h
+++ b/nx-X11/programs/Xserver/include/miscstruct.h
@@ -61,7 +61,7 @@ typedef struct _Box {
} BoxRec;
typedef union _DevUnion {
- pointer ptr;
+ void * ptr;
long val;
unsigned long uval;
RegionPtr (*fptr)(
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 0b3354eec..551b35097 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -53,7 +53,7 @@ SOFTWARE.
#include "misc.h"
#define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
-#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
+#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr))
#include <X11/Xalloca.h>
#ifndef IN_MODULE
#include <stdarg.h>
@@ -75,19 +75,19 @@ SOFTWARE.
#define MAX_BIG_REQUEST_SIZE 4194303
#endif
-typedef pointer FID;
+typedef void * FID;
typedef struct _FontPathRec *FontPathPtr;
typedef struct _NewClientRec *NewClientPtr;
#ifndef xalloc
#define xnfalloc(size) XNFalloc((unsigned long)(size))
#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
+#define xnfrealloc(ptr, size) XNFrealloc((void *)(ptr), (unsigned long)(size))
#define xalloc(size) Xalloc((unsigned long)(size))
#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
-#define xfree(ptr) Xfree((pointer)(ptr))
+#define xrealloc(ptr, size) Xrealloc((void *)(ptr), (unsigned long)(size))
+#define xfree(ptr) Xfree((void *)(ptr))
#define xstrdup(s) Xstrdup(s)
#define xnfstrdup(s) XNFstrdup(s)
#endif
@@ -158,7 +158,7 @@ extern char *ClientAuthorized(
extern Bool EstablishNewConnections(
ClientPtr /*clientUnused*/,
- pointer /*closure*/);
+ void * /*closure*/);
extern void CheckConnections(void);
@@ -189,7 +189,7 @@ extern void AvailableClientInput(ClientPtr /* client */);
extern CARD32 GetTimeInMillis(void);
extern void AdjustWaitForDelay(
- pointer /*waitTime*/,
+ void * /*waitTime*/,
unsigned long /*newdelay*/);
typedef struct _OsTimerRec *OsTimerPtr;
@@ -197,7 +197,7 @@ typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback)(
OsTimerPtr /* timer */,
CARD32 /* time */,
- pointer /* arg */);
+ void * /* arg */);
extern void TimerInit(void);
@@ -211,7 +211,7 @@ extern OsTimerPtr TimerSet(
int /* flags */,
CARD32 /* millis */,
OsTimerCallback /* func */,
- pointer /* arg */);
+ void * /* arg */);
extern void TimerCheck(void);
extern void TimerCancel(OsTimerPtr /* pTimer */);
@@ -238,19 +238,19 @@ extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
extern int set_font_authorizations(
char ** /* authorizations */,
int * /*authlen */,
- pointer /* client */);
+ void * /* client */);
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
-extern pointer Xalloc(unsigned long /*amount*/);
-extern pointer Xcalloc(unsigned long /*amount*/);
-extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/);
-extern void Xfree(pointer /*ptr*/);
+extern void * Xalloc(unsigned long /*amount*/);
+extern void * Xcalloc(unsigned long /*amount*/);
+extern void * Xrealloc(void * /*ptr*/, unsigned long /*amount*/);
+extern void Xfree(void * /*ptr*/);
#endif
-extern pointer XNFalloc(unsigned long /*amount*/);
-extern pointer XNFcalloc(unsigned long /*amount*/);
-extern pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/);
+extern void * XNFalloc(unsigned long /*amount*/);
+extern void * XNFcalloc(unsigned long /*amount*/);
+extern void * XNFrealloc(void * /*ptr*/, unsigned long /*amount*/);
extern void OsInitAllocator(void);
@@ -296,10 +296,10 @@ void OsReleaseSignals (void);
#if !defined(WIN32) && !defined(__UNIXOS2__)
extern int System(char *);
-extern pointer Popen(char *, char *);
-extern int Pclose(pointer);
-extern pointer Fopen(char *, char *);
-extern int Fclose(pointer);
+extern void * Popen(char *, char *);
+extern int Pclose(void *);
+extern void * Fopen(char *, char *);
+extern int Fclose(void *);
#else
#define System(a) system(a)
#define Popen(a,b) popen(a,b)
@@ -315,24 +315,24 @@ extern int AddHost(
ClientPtr /*client*/,
int /*family*/,
unsigned /*length*/,
- pointer /*pAddr*/);
+ void * /*pAddr*/);
extern Bool ForEachHostInFamily (
int /*family*/,
Bool (* /*func*/ )(
unsigned char * /* addr */,
short /* len */,
- pointer /* closure */),
- pointer /*closure*/);
+ void * /* closure */),
+ void * /*closure*/);
extern int RemoveHost(
ClientPtr /*client*/,
int /*family*/,
unsigned /*length*/,
- pointer /*pAddr*/);
+ void * /*pAddr*/);
extern int GetHosts(
- pointer * /*data*/,
+ void ** /*data*/,
int * /*pnHosts*/,
int * /*pLen*/,
BOOL * /*pEnabled*/);
@@ -362,7 +362,7 @@ extern void AccessUsingXdmcp(void);
extern void DefineSelf(int /*fd*/);
-extern void AugmentSelf(pointer /*from*/, int /*len*/);
+extern void AugmentSelf(void * /*from*/, int /*len*/);
extern void InitAuthorization(char * /*filename*/);
@@ -467,7 +467,7 @@ typedef struct {
extern CallbackListPtr ReplyCallback;
typedef struct {
ClientPtr client;
- pointer replyData;
+ void * replyData;
unsigned long dataLenBytes;
unsigned long bytesRemaining;
Bool startOfReply;
diff --git a/nx-X11/programs/Xserver/include/pixmap.h b/nx-X11/programs/Xserver/include/pixmap.h
index 6cea329ec..3c9f91a00 100644
--- a/nx-X11/programs/Xserver/include/pixmap.h
+++ b/nx-X11/programs/Xserver/include/pixmap.h
@@ -92,7 +92,7 @@ extern PixmapPtr GetScratchPixmapHeader(
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
- pointer /*pPixData*/);
+ void * /*pPixData*/);
extern void FreeScratchPixmapHeader(
PixmapPtr /*pPixmap*/);
diff --git a/nx-X11/programs/Xserver/include/property.h b/nx-X11/programs/Xserver/include/property.h
index 21a38d51c..080d52937 100644
--- a/nx-X11/programs/Xserver/include/property.h
+++ b/nx-X11/programs/Xserver/include/property.h
@@ -61,7 +61,7 @@ extern int ChangeWindowProperty(
int /*format*/,
int /*mode*/,
unsigned long /*len*/,
- pointer /*value*/,
+ void * /*value*/,
Bool /*sendevent*/);
extern int DeleteProperty(
diff --git a/nx-X11/programs/Xserver/include/propertyst.h b/nx-X11/programs/Xserver/include/propertyst.h
index 177fca171..8f9abd5f8 100644
--- a/nx-X11/programs/Xserver/include/propertyst.h
+++ b/nx-X11/programs/Xserver/include/propertyst.h
@@ -61,7 +61,7 @@ typedef struct _Property {
ATOM type; /* ignored by server */
short format; /* format of data for swapping - 8,16,32 */
long size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
#if defined(LBX) || defined(LBX_COMPAT)
/* If space is at a premium and binary compatibility is not
* an issue, you may want to put the owner_pid next to format
diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h
index 49c189869..3aac8bb00 100644
--- a/nx-X11/programs/Xserver/include/resource.h
+++ b/nx-X11/programs/Xserver/include/resource.h
@@ -123,24 +123,24 @@ typedef unsigned long RESTYPE;
#define BAD_RESOURCE 0xe0000000
typedef int (*DeleteType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/);
typedef void (*FindResType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
typedef void (*FindAllRes)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
RESTYPE /*type*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
typedef Bool (*FindComplexResType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern RESTYPE CreateNewResourceType(
DeleteType /*deleteFunc*/);
@@ -161,7 +161,7 @@ extern XID FakeClientID(
extern Bool AddResource(
XID /*id*/,
RESTYPE /*type*/,
- pointer /*value*/);
+ void * /*value*/);
extern void FreeResource(
XID /*id*/,
@@ -175,18 +175,18 @@ extern void FreeResourceByType(
extern Bool ChangeResourceValue(
XID /*id*/,
RESTYPE /*rtype*/,
- pointer /*value*/);
+ void * /*value*/);
extern void FindClientResourcesByType(
ClientPtr /*client*/,
RESTYPE /*type*/,
FindResType /*func*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern void FindAllClientResources(
ClientPtr /*client*/,
FindAllRes /*func*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern void FreeClientNeverRetainResources(
ClientPtr /*client*/);
@@ -200,19 +200,19 @@ extern Bool LegalNewID(
XID /*id*/,
ClientPtr /*client*/);
-extern pointer LookupIDByType(
+extern void * LookupIDByType(
XID /*id*/,
RESTYPE /*rtype*/);
-extern pointer LookupIDByClass(
+extern void * LookupIDByClass(
XID /*id*/,
RESTYPE /*classes*/);
-extern pointer LookupClientResourceComplex(
+extern void * LookupClientResourceComplex(
ClientPtr client,
RESTYPE type,
FindComplexResType func,
- pointer cdata);
+ void * cdata);
/* These are the access modes that can be passed in the last parameter
* to SecurityLookupIDByType/Class. The Security extension doesn't
@@ -229,13 +229,13 @@ extern pointer LookupClientResourceComplex(
#ifdef XCSECURITY
-extern pointer SecurityLookupIDByType(
+extern void * SecurityLookupIDByType(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*rtype*/,
Mask /*access_mode*/);
-extern pointer SecurityLookupIDByClass(
+extern void * SecurityLookupIDByClass(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*classes*/,
diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h
index ef9358689..297227493 100644
--- a/nx-X11/programs/Xserver/include/scrnintstr.h
+++ b/nx-X11/programs/Xserver/include/scrnintstr.h
@@ -85,8 +85,8 @@ typedef struct _Depth {
/*
- * There is a typedef for each screen function pointer so that code that
- * needs to declare a screen function pointer (e.g. in a screen private
+ * There is a typedef for each screen function void * so that code that
+ * needs to declare a screen function void * (e.g. in a screen private
* or as a local variable) can easily do so and retain full type checking.
*/
@@ -431,15 +431,15 @@ typedef void (* SendGraphicsExposeProcPtr)(
typedef void (* ScreenBlockHandlerProcPtr)(
int /*screenNum*/,
- pointer /*blockData*/,
- pointer /*pTimeout*/,
- pointer /*pReadmask*/);
+ void * /*blockData*/,
+ void * /*pTimeout*/,
+ void * /*pReadmask*/);
typedef void (* ScreenWakeupHandlerProcPtr)(
int /*screenNum*/,
- pointer /*wakeupData*/,
+ void * /*wakeupData*/,
unsigned long /*result*/,
- pointer /*pReadMask*/);
+ void * /*pReadMask*/);
typedef Bool (* CreateScreenResourcesProcPtr)(
ScreenPtr /*pScreen*/);
@@ -451,7 +451,7 @@ typedef Bool (* ModifyPixmapHeaderProcPtr)(
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
- pointer /*pPixData*/);
+ void * /*pPixData*/);
typedef PixmapPtr (* GetWindowPixmapProcPtr)(
WindowPtr /*pWin*/);
@@ -546,7 +546,7 @@ typedef struct _Screen {
a standard one.
*/
PixmapPtr PixmapPerDepth[1];
- pointer devPrivate;
+ void * devPrivate;
short numVisuals;
VisualPtr visuals;
int WindowPrivateLen;
@@ -668,8 +668,8 @@ typedef struct _Screen {
ScreenBlockHandlerProcPtr BlockHandler;
ScreenWakeupHandlerProcPtr WakeupHandler;
- pointer blockData;
- pointer wakeupData;
+ void * blockData;
+ void * wakeupData;
/* anybody can get a piece of this array */
DevUnion *devPrivates;
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h
index 7c3fce092..cbfed645f 100644
--- a/nx-X11/programs/Xserver/include/window.h
+++ b/nx-X11/programs/Xserver/include/window.h
@@ -73,17 +73,17 @@ typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr)(
WindowPtr /*pWin*/,
- pointer /*data*/);
+ void * /*data*/);
extern int TraverseTree(
WindowPtr /*pWin*/,
VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ void * /*data*/);
extern int WalkTree(
ScreenPtr /*pScreen*/,
VisitWindowProcPtr /*func*/,
- pointer /*data*/);
+ void * /*data*/);
extern WindowPtr AllocateWindow(
ScreenPtr /*pScreen*/);
@@ -122,7 +122,7 @@ extern WindowPtr CreateWindow(
int* /*error*/);
extern int DeleteWindow(
- pointer /*pWin*/,
+ void * /*pWin*/,
XID /*wid*/);
extern void DestroySubwindows(
diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h
index 89e3ee10b..dab6fcf71 100644
--- a/nx-X11/programs/Xserver/include/windowstr.h
+++ b/nx-X11/programs/Xserver/include/windowstr.h
@@ -114,7 +114,7 @@ typedef struct _Window {
Mask eventMask;
PixUnion background;
PixUnion border;
- pointer backStorage; /* null when BS disabled */
+ void * backStorage; /* null when BS disabled */
WindowOptPtr optional;
unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */
unsigned borderIsPixel:1;