diff options
Diffstat (limited to 'xorg-server/include')
29 files changed, 158 insertions, 152 deletions
diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h index b42708960..df638c0d4 100644 --- a/xorg-server/include/callback.h +++ b/xorg-server/include/callback.h @@ -62,21 +62,21 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */ #define _XTYPEDEF_CALLBACKLISTPTR #endif -typedef void (*CallbackProcPtr) (CallbackListPtr *, pointer, pointer); +typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *); extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ , CallbackProcPtr /*callback */ , - pointer /*data */ ); + void */*data */ ); extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ , CallbackProcPtr /*callback */ , - pointer /*data */ ); + void */*data */ ); extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ , - pointer /*call_data */ ); + void */*call_data */ ); static inline void -CallCallbacks(CallbackListPtr *pcbl, pointer call_data) +CallCallbacks(CallbackListPtr *pcbl, void *call_data) { if (!pcbl || !*pcbl) return; diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h index c6aa1295f..60e6f09bc 100644 --- a/xorg-server/include/closestr.h +++ b/xorg-server/include/closestr.h @@ -47,7 +47,7 @@ typedef struct _OFclosure { Mask flags; /* XXX -- get these from request buffer instead? */ - char *origFontName; + const char *origFontName; int origFontNameLen; XID fontid; char *fontname; @@ -64,7 +64,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/xorg-server/include/colormap.h b/xorg-server/include/colormap.h index 8996cfec5..22229ca84 100644 --- a/xorg-server/include/colormap.h +++ b/xorg-server/include/colormap.h @@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ , int /*alloc */ , int /*client */ ); -extern _X_EXPORT int FreeColormap(pointer /*pmap */ , +extern _X_EXPORT int FreeColormap(void */*pmap */ , XID /*mid */ ); extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ , - pointer /* Colormap *pmid */ ); + void */* Colormap *pmid */ ); extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ , - pointer /* Colormap *pmid */ ); + void */* Colormap *pmid */ ); extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ , ColormapPtr /*pSrc */ , @@ -126,7 +126,7 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ , xrgb * /*prgbList */ , ClientPtr client); -extern _X_EXPORT int FreeClientPixels(pointer /*pcr */ , +extern _X_EXPORT int FreeClientPixels(void */*pcr */ , XID /*fakeid */ ); extern _X_EXPORT int AllocColorCells(int /*client */ , diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h index 89a650fc5..9da08affd 100644 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h @@ -68,7 +68,7 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv; extern _X_EXPORT CursorPtr rootCursor; -extern _X_EXPORT int FreeCursor(pointer /*pCurs */ , +extern _X_EXPORT int FreeCursor(void */*pCurs */ , XID /*cid */ ); extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */); diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index 306610000..957257b12 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -469,4 +469,7 @@ /* Directory for shared memory temp files */ #undef SHMDIR +/* Don't let Xdefs.h define 'pointer' */ +#define _XTYPEDEF_POINTER 1 + #endif /* _DIX_CONFIG_H_ */ diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index fa7ccd4a3..8371df072 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void); extern _X_EXPORT void UpdateCurrentTimeIf(void); -extern _X_EXPORT int dixDestroyPixmap(pointer /*value */ , +extern _X_EXPORT int dixDestroyPixmap(void */*value */ , XID /*pid */ ); extern _X_EXPORT void InitClient(ClientPtr /*client */ , int /*i */ , - pointer /*ospriv */ ); + void */*ospriv */ ); -extern _X_EXPORT ClientPtr NextAvailableClient(pointer /*ospriv */ ); +extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ ); extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ , unsigned int /*majorCode */ , @@ -203,11 +203,11 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ , extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ ); -extern _X_EXPORT void BlockHandler(pointer /*pTimeout */ , - pointer /*pReadmask */ ); +extern _X_EXPORT void BlockHandler(void */*pTimeout */ , + void */*pReadmask */ ); extern _X_EXPORT void WakeupHandler(int /*result */ , - pointer /*pReadmask */ ); + void */*pReadmask */ ); void EnableLimitedSchedulingLatency(void); @@ -215,21 +215,21 @@ void void DisableLimitedSchedulingLatency(void); -typedef void (*WakeupHandlerProcPtr) (pointer /* blockData */ , +typedef void (*WakeupHandlerProcPtr) (void */* blockData */ , int /* result */ , - pointer /* pReadmask */ ); + void */* pReadmask */ ); extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - pointer /*blockData */ ); + void */*blockData */ ); extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - pointer /*blockData */ ); + void */*blockData */ ); extern _X_EXPORT void InitBlockAndWakeupHandlers(void); @@ -241,18 +241,18 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )( ClientPtr /*clientUnused */ , - pointer + void * /*closure */ ), ClientPtr /*client */ , - pointer /*closure */ + void */*closure */ ); typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ , - pointer /*closure */ ); + void */*closure */ ); extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ , ClientSleepProcPtr /* function */ , - pointer /*closure */ ); + void */*closure */ ); #ifndef ___CLIENTSIGNAL_DEFINED___ #define ___CLIENTSIGNAL_DEFINED___ @@ -289,7 +289,10 @@ extern _X_EXPORT void SetVendorRelease(int release); extern _X_EXPORT void -SetVendorString(char *string); +SetVendorString(const char *string); + +int +dix_main(int argc, char *argv[], char *envp[]); /* events.c */ @@ -441,7 +444,7 @@ extern void RecalculateDeliverableEvents(WindowPtr /* pWin */ ); extern _X_EXPORT int -OtherClientGone(pointer /* value */ , +OtherClientGone(void */* value */ , XID /* id */ ); extern void diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h index 0a5f105c0..40d80c141 100644 --- a/xorg-server/include/dixfont.h +++ b/xorg-server/include/dixfont.h @@ -34,23 +34,23 @@ SOFTWARE. typedef struct _DIXFontProp *DIXFontPropPtr; -extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname */ ); +extern _X_EXPORT Bool SetDefaultFont(const char * /*defaultfontname */ ); extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ ); extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ ); -extern _X_EXPORT void FontWakeup(pointer /*data */ , +extern _X_EXPORT void FontWakeup(void */*data */ , int /*count */ , - pointer /*LastSelectMask */ ); + void */*LastSelectMask */ ); extern _X_EXPORT int OpenFont(ClientPtr /*client */ , XID /*fid */ , Mask /*flags */ , unsigned /*lenfname */ , - char * /*pfontname */ ); + const char * /*pfontname */ ); -extern _X_EXPORT int CloseFont(pointer /*pfont */ , +extern _X_EXPORT int CloseFont(void */*pfont */ , XID /*fid */ ); typedef struct _xQueryFontReply *xQueryFontReplyPtr; @@ -99,7 +99,7 @@ extern _X_EXPORT int SetFontPath(ClientPtr /*client */ , int /*npaths */ , unsigned char * /*paths */ ); -extern _X_EXPORT int SetDefaultFontPath(char * /*path */ ); +extern _X_EXPORT int SetDefaultFontPath(const char * /*path */ ); extern _X_EXPORT int GetFontPath(ClientPtr client, int *count, diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h index ca3c95be7..d78d8127b 100644 --- a/xorg-server/include/dixgrabs.h +++ b/xorg-server/include/dixgrabs.h @@ -47,7 +47,7 @@ extern GrabPtr CreateGrab(int /* client */ , WindowPtr /* confineTo */ , CursorPtr /* cursor */ ); -extern _X_EXPORT int DeletePassiveGrab(pointer /* value */ , +extern _X_EXPORT int DeletePassiveGrab(void */* value */ , XID /* id */ ); extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ , diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index 6f5667fcb..a11729bdf 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -74,8 +74,8 @@ typedef struct _saveSet { #define SaveSetAssignMap(ss,m) ((ss).map = (m)) typedef struct _Client { - pointer requestBuffer; - pointer osPrivate; /* for OS layer, including scheduler */ + void *requestBuffer; + void *osPrivate; /* for OS layer, including scheduler */ Mask clientAsMask; short index; unsigned char majorOp, minorOp; @@ -149,10 +149,10 @@ SmartScheduleInit(void); typedef struct _WorkQueue { struct _WorkQueue *next; Bool (*function) (ClientPtr /* pClient */ , - pointer /* closure */ + void * /* closure */ ); ClientPtr client; - pointer closure; + void *closure; } WorkQueueRec; extern _X_EXPORT TimeStamp currentTime; @@ -166,7 +166,7 @@ ClientTimeToServerTime(CARD32 /*c */ ); typedef struct _CallbackRec { CallbackProcPtr proc; - pointer data; + void *data; Bool deleted; struct _CallbackRec *next; } CallbackRec, *CallbackPtr; diff --git a/xorg-server/include/extnsionst.h b/xorg-server/include/extnsionst.h index e82523698..fbdb73c53 100644 --- a/xorg-server/include/extnsionst.h +++ b/xorg-server/include/extnsionst.h @@ -58,15 +58,15 @@ typedef struct _ExtensionEntry { int index; void (*CloseDown) ( /* called at server shutdown */ struct _ExtensionEntry * /* extension */ ); - char *name; /* extension name */ + const char *name; /* extension name */ int base; /* base request number */ int eventBase; int eventLast; int errorBase; int errorLast; int num_aliases; - char **aliases; - pointer extPrivate; + const char **aliases; + void *extPrivate; unsigned short (*MinorOpcode) ( /* called for errors */ ClientPtr /* client */ ); PrivateRec *devPrivates; diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h index 6e5b92da2..ecaa257bb 100644 --- a/xorg-server/include/gc.h +++ b/xorg-server/include/gc.h @@ -88,7 +88,7 @@ extern _X_EXPORT void ValidateGC(DrawablePtr /*pDraw */ , typedef union { CARD32 val; - pointer ptr; + void *ptr; } ChangeGCVal, *ChangeGCValPtr; extern int ChangeGCXIDs(ClientPtr /*client */ , @@ -112,7 +112,7 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ , GCPtr /*pgcDst */ , BITS32 /*mask */ ); -extern _X_EXPORT int FreeGC(pointer /*pGC */ , +extern _X_EXPORT int FreeGC(void */*pGC */ , XID /*gid */ ); extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ ); diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h index 7621ceb11..c830ccde7 100644 --- a/xorg-server/include/gcstruct.h +++ b/xorg-server/include/gcstruct.h @@ -78,7 +78,7 @@ typedef struct _GCFuncs { void (*ChangeClip) (GCPtr /*pGC */ , int /*type */ , - pointer /*pvalue */ , + void */*pvalue */ , int /*nrects */ ); void (*DestroyClip) (GCPtr /*pGC */ ); @@ -216,7 +216,7 @@ typedef struct _GCOps { int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - pointer /*pglyphBase */ ); + void */*pglyphBase */ ); void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ , GCPtr /*pGC */ , @@ -224,7 +224,7 @@ typedef struct _GCOps { int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - pointer /*pglyphBase */ ); + void */*pglyphBase */ ); void (*PushPixels) (GCPtr /*pGC */ , PixmapPtr /*pBitMap */ , @@ -273,11 +273,11 @@ typedef struct _GC { DDXPointRec patOrg; /* origin for (tile, stipple) */ struct _Font *font; DDXPointRec clipOrg; - pointer clientClip; + void *clientClip; unsigned long stateChanges; /* masked with GC_<kind> */ unsigned long serialNumber; - GCFuncs *funcs; - GCOps *ops; + const GCFuncs *funcs; + const GCOps *ops; PrivateRec *devPrivates; /* * The following were moved here from private storage to allow device- diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h index 7786987a4..858c9a375 100644 --- a/xorg-server/include/globals.h +++ b/xorg-server/include/globals.h @@ -18,7 +18,7 @@ extern _X_EXPORT CARD32 ScreenSaverInterval; extern _X_EXPORT Bool screenSaverSuspended; #endif -extern _X_EXPORT char *defaultFontPath; +extern _X_EXPORT const char *defaultFontPath; extern _X_EXPORT int monitorResolution; extern _X_EXPORT int defaultColorVisualClass; diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 2d5e531ef..455963f6a 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -163,7 +163,7 @@ typedef Bool (*PointerAccelSchemeInitProc) (DeviceIntPtr /*dev */ , /*protoScheme */ ); typedef struct _DeviceRec { - pointer devicePrivate; + void *devicePrivate; ProcessInputProc processInputProc; /* current */ ProcessInputProc realInputProc; /* deliver */ ProcessInputProc enqueueInputProc; /* enqueue */ @@ -221,12 +221,12 @@ typedef struct _InputOption InputOption; typedef struct _XI2Mask XI2Mask; typedef struct _InputAttributes { - char *product; - char *vendor; - char *device; - char *pnp_id; - char *usb_id; - char **tags; /* null-terminated */ + const char *product; + const char *vendor; + const char *device; + const char *pnp_id; + const char *usb_id; + const char **tags; /* null-terminated */ uint32_t flags; } InputAttributes; @@ -316,7 +316,7 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ , typedef void (*BellProcPtr) (int /*percent */ , DeviceIntPtr /*device */ , - pointer /*ctrl */ , + void */*ctrl */ , int); typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ , diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index dc36c5d8d..dfcf7c383 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -447,7 +447,7 @@ typedef struct _XIPropertyValue { 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 */ } XIPropertyValueRec; typedef struct _XIProperty { @@ -542,7 +542,7 @@ typedef struct _DeviceIntRec { GrabInfoRec deviceGrab; /* grab on the device */ int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */ Atom xinput_type; - char *name; + const char *name; int id; KeyClassPtr key; ValuatorClassPtr valuator; diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 17de71041..165d42e85 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -246,7 +246,7 @@ padding_for_int32(const int bytes) } -extern char **xstrtokenize(const char *str, const char *separators); +extern const char **xstrtokenize(const char *str, const char *separators); extern void FormatInt64(int64_t num, char *string); extern void FormatUInt64(uint64_t num, char *string); extern void FormatUInt64Hex(uint64_t num, char *string); diff --git a/xorg-server/include/miscstruct.h b/xorg-server/include/miscstruct.h index 0820e1e81..dbab10f08 100644 --- a/xorg-server/include/miscstruct.h +++ b/xorg-server/include/miscstruct.h @@ -56,10 +56,10 @@ typedef xPoint DDXPointRec; typedef struct pixman_box16 BoxRec; typedef union _DevUnion { - pointer ptr; + void *ptr; long val; unsigned long uval; - pointer (*fptr) (void); + void *(*fptr) (void); } DevUnion; #endif /* MISCSTRUCT_H */ diff --git a/xorg-server/include/opaque.h b/xorg-server/include/opaque.h index b76ab6e6b..73d40c345 100644 --- a/xorg-server/include/opaque.h +++ b/xorg-server/include/opaque.h @@ -33,8 +33,8 @@ from The Open Group. #include "globals.h" -extern _X_EXPORT char *defaultTextFont; -extern _X_EXPORT char *defaultCursorFont; +extern _X_EXPORT const char *defaultTextFont; +extern _X_EXPORT const char *defaultCursorFont; extern _X_EXPORT int MaxClients; extern _X_EXPORT volatile char isItTimeToYield; extern _X_EXPORT volatile char dispatchException; @@ -49,7 +49,7 @@ extern _X_EXPORT int ScreenSaverBlanking; extern _X_EXPORT int ScreenSaverAllowExposures; extern _X_EXPORT int defaultScreenSaverBlanking; extern _X_EXPORT int defaultScreenSaverAllowExposures; -extern _X_EXPORT char *display; +extern _X_EXPORT const char *display; extern _X_EXPORT int displayfd; extern _X_EXPORT int defaultBackingStore; diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 9b6729421..e5f86d67d 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -70,12 +70,12 @@ 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 @@ -140,7 +140,7 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ , char * /*auth_string */ ); extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ , - pointer /*closure */ ); + void */*closure */ ); extern _X_EXPORT void CheckConnections(void); @@ -173,14 +173,14 @@ extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ ); extern _X_EXPORT CARD32 GetTimeInMillis(void); extern _X_EXPORT CARD64 GetTimeInMicros(void); -extern _X_EXPORT void AdjustWaitForDelay(pointer /*waitTime */ , +extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ , unsigned long /*newdelay */ ); typedef struct _OsTimerRec *OsTimerPtr; typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ , CARD32 /* time */ , - pointer /* arg */ ); + void */* arg */ ); extern _X_EXPORT void TimerInit(void); @@ -193,7 +193,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ , int /* flags */ , CARD32 /* millis */ , OsTimerCallback /* func */ , - pointer /* arg */ ); + void */* arg */ ); extern _X_EXPORT void TimerCheck(void); extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ ); @@ -212,7 +212,7 @@ extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []); extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ , int * /*authlen */ , - pointer /* client */ ); + void */* client */ ); #ifndef _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS @@ -359,14 +359,14 @@ OsAbort(void) #if !defined(WIN32) extern _X_EXPORT int System(const char *); -extern _X_EXPORT pointer +extern _X_EXPORT void * Popen(const char *, const char *); extern _X_EXPORT int -Pclose(pointer); -extern _X_EXPORT pointer +Pclose(void *); +extern _X_EXPORT void * Fopen(const char *, const char *); extern _X_EXPORT int -Fclose(pointer); +Fclose(void *); #else extern const char * @@ -395,17 +395,17 @@ ForEachHostInFamily(int /*family */ , Bool (* /*func */ )( unsigned char * /* addr */ , short /* len */ , - pointer /* closure */ ), - pointer /*closure */ ); + void */* closure */ ), + void */*closure */ ); extern _X_EXPORT int RemoveHost(ClientPtr /*client */ , int /*family */ , unsigned /*length */ , - pointer /*pAddr */ ); + void */*pAddr */ ); extern _X_EXPORT int -GetHosts(pointer * /*data */ , +GetHosts(void ** /*data */ , int * /*pnHosts */ , int * /*pLen */ , BOOL * /*pEnabled */ ); @@ -448,7 +448,7 @@ extern _X_EXPORT void AddLocalHosts(void); extern _X_EXPORT void -ResetHosts(char *display); +ResetHosts(const char *display); extern _X_EXPORT void EnableLocalHost(void); @@ -464,14 +464,14 @@ DefineSelf(int /*fd */ ); #if XDMCP extern _X_EXPORT void -AugmentSelf(pointer /*from */ , int /*len */ ); +AugmentSelf(void */*from */ , int /*len */ ); extern _X_EXPORT void RegisterAuthorizations(void); #endif extern _X_EXPORT void -InitAuthorization(char * /*filename */ ); +InitAuthorization(const char * /*filename */ ); /* extern int LoadAuthorization(void); */ diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h index 921a94d1e..46ec3f5a2 100644 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h @@ -99,7 +99,7 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ , int /*depth */ , int /*bitsPerPixel */ , int /*devKind */ , - pointer /*pPixData */ ); + void */*pPixData */ ); extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ ); diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h index 0abdce784..7d1461cdb 100644 --- a/xorg-server/include/privates.h +++ b/xorg-server/include/privates.h @@ -142,10 +142,10 @@ dixGetPrivate(PrivatePtr *privates, const DevPrivateKey key) * dixLookupPrivate(privates, key) will return 'val'. */ static inline void -dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, pointer val) +dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, void *val) { assert(key->size == 0); - *(pointer *) dixGetPrivateAddr(privates, key) = val; + *(void **) dixGetPrivateAddr(privates, key) = val; } #include "dix.h" @@ -158,7 +158,7 @@ dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, pointer val) * storage. For privates without defined storage, return the pointer * contents */ -static inline pointer +static inline void * dixLookupPrivate(PrivatePtr *privates, const DevPrivateKey key) { if (key->size) @@ -173,11 +173,11 @@ dixLookupPrivate(PrivatePtr *privates, const DevPrivateKey key) * This returns the place where the private pointer is stored, * which is only valid for privates without predefined storage. */ -static inline pointer * +static inline void ** dixLookupPrivateAddr(PrivatePtr *privates, const DevPrivateKey key) { assert(key->size == 0); - return (pointer *) dixGetPrivateAddr(privates, key); + return (void **) dixGetPrivateAddr(privates, key); } extern _X_EXPORT Bool @@ -204,19 +204,19 @@ dixGetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, static inline void dixSetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, - ScreenPtr pScreen, pointer val) + ScreenPtr pScreen, void *val) { dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val); } -static inline pointer +static inline void * dixLookupScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenPtr pScreen) { return dixLookupPrivate(privates, _dixGetScreenPrivateKey(key, pScreen)); } -static inline pointer * +static inline void ** dixLookupScreenPrivateAddr(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenPtr pScreen) { diff --git a/xorg-server/include/property.h b/xorg-server/include/property.h index 4219fc487..3b8ea8b2d 100644 --- a/xorg-server/include/property.h +++ b/xorg-server/include/property.h @@ -64,7 +64,7 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ , int /*format */ , int /*mode */ , unsigned long /*len */ , - pointer /*value */ , + void */*value */ , Bool /*sendevent */ ); extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ , @@ -73,7 +73,7 @@ extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ , int /*format */ , int /*mode */ , unsigned long /*len */ , - pointer /*value */ , + void */*value */ , Bool /*sendevent */ ); extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ , diff --git a/xorg-server/include/propertyst.h b/xorg-server/include/propertyst.h index c12c71af6..da995769c 100644 --- a/xorg-server/include/propertyst.h +++ b/xorg-server/include/propertyst.h @@ -59,7 +59,7 @@ typedef struct _Property { ATOM type; /* ignored by server */ uint32_t format; /* format of data for swapping - 8,16,32 */ uint32_t size; /* size of data in (format/8) bytes */ - pointer data; /* private to client */ + void *data; /* private to client */ PrivateRec *devPrivates; } PropertyRec; diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index 4a8dc3169..db44aefad 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -133,24 +133,24 @@ typedef struct { ResourceState state; XID id; RESTYPE type; - pointer value; + void *value; } ResourceStateInfoRec; -typedef int (*DeleteType) (pointer /*value */ , +typedef int (*DeleteType) (void */*value */ , XID /*id */ ); -typedef void (*FindResType) (pointer /*value */ , +typedef void (*FindResType) (void */*value */ , XID /*id */ , - pointer /*cdata */ ); + void */*cdata */ ); -typedef void (*FindAllRes) (pointer /*value */ , +typedef void (*FindAllRes) (void */*value */ , XID /*id */ , RESTYPE /*type */ , - pointer /*cdata */ ); + void */*cdata */ ); -typedef Bool (*FindComplexResType) (pointer /*value */ , +typedef Bool (*FindComplexResType) (void */*value */ , XID /*id */ , - pointer /*cdata */ ); + void */*cdata */ ); /* Structure for estimating resource memory usage. Memory usage * consists of space allocated for the resource itself and of @@ -166,16 +166,16 @@ typedef struct { unsigned long refCnt; } ResourceSizeRec, *ResourceSizePtr; -typedef void (*SizeType)(pointer /*value*/, +typedef void (*SizeType)(void */*value*/, XID /*id*/, ResourceSizePtr /*size*/); extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ , const char * /*name */ ); -typedef void (*FindTypeSubResources)(pointer /* value */, +typedef void (*FindTypeSubResources)(void */* value */, FindAllRes /* func */, - pointer /* cdata */); + void */* cdata */); extern _X_EXPORT SizeType GetResourceTypeSizeFunc( RESTYPE /*type*/); @@ -202,7 +202,7 @@ extern _X_EXPORT XID FakeClientID(int /*client */ ); #endif extern _X_EXPORT Bool AddResource(XID /*id */ , RESTYPE /*type */ , - pointer /*value */ ); + void */*value */ ); extern _X_EXPORT void FreeResource(XID /*id */ , RESTYPE /*skipDeleteFuncType */ ); @@ -213,25 +213,25 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ , extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ , RESTYPE /*rtype */ , - pointer /*value */ ); + void */*value */ ); extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ , RESTYPE /*type */ , FindResType /*func */ , - pointer /*cdata */ ); + void */*cdata */ ); extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ , FindAllRes /*func */ , - pointer /*cdata */ ); + void */*cdata */ ); /** @brief Iterate through all subresources of a resource. @note The XID argument provided to the FindAllRes function may be 0 for subresources that don't have an XID */ -extern _X_EXPORT void FindSubResources(pointer /*resource*/, +extern _X_EXPORT void FindSubResources(void */*resource*/, RESTYPE /*type*/, FindAllRes /*func*/, - pointer /*cdata*/); + void */*cdata*/); extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ ); @@ -242,18 +242,18 @@ extern _X_EXPORT void FreeAllResources(void); extern _X_EXPORT Bool LegalNewID(XID /*id */ , ClientPtr /*client */ ); -extern _X_EXPORT pointer LookupClientResourceComplex(ClientPtr client, +extern _X_EXPORT void *LookupClientResourceComplex(ClientPtr client, RESTYPE type, FindComplexResType func, - pointer cdata); + void *cdata); -extern _X_EXPORT int dixLookupResourceByType(pointer *result, +extern _X_EXPORT int dixLookupResourceByType(void **result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); -extern _X_EXPORT int dixLookupResourceByClass(pointer *result, +extern _X_EXPORT int dixLookupResourceByClass(void **result, XID id, RESTYPE rclass, ClientPtr client, diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index df7407391..86da78966 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -260,12 +260,12 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ , int /*minor */ ); typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ , - pointer /*pTimeout */ , - pointer /*pReadmask */ ); + void */*pTimeout */ , + void */*pReadmask */ ); typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ , unsigned long /*result */ , - pointer /*pReadMask */ ); + void */*pReadMask */ ); typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ ); @@ -275,7 +275,7 @@ typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ , int /*depth */ , int /*bitsPerPixel */ , int /*devKind */ , - pointer /*pPixData */ ); + void */*pPixData */ ); typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ ); @@ -375,7 +375,7 @@ typedef struct _Screen { a standard one. */ PixmapPtr PixmapPerDepth[1]; - pointer devPrivate; + void *devPrivate; short numVisuals; VisualPtr visuals; WindowPtr root; diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h index b6d61c339..b5a937eef 100644 --- a/xorg-server/include/window.h +++ b/xorg-server/include/window.h @@ -73,15 +73,15 @@ typedef struct _BackingStore *BackingStorePtr; typedef struct _Window *WindowPtr; typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ , - pointer /*data */ ); + void */*data */ ); extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ , VisitWindowProcPtr /*func */ , - pointer /*data */ ); + void */*data */ ); extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ , VisitWindowProcPtr /*func */ , - pointer /*data */ ); + void */*data */ ); extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ ); @@ -108,7 +108,7 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ , VisualID /*visual */ , int * /*error */ ); -extern _X_EXPORT int DeleteWindow(pointer /*pWin */ , +extern _X_EXPORT int DeleteWindow(void */*pWin */ , XID /*wid */ ); extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ , diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index a1e608f09..6b79bbd2e 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -144,7 +144,7 @@ typedef struct _Window { Mask eventMask; /* mask from the creating client */ 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; diff --git a/xorg-server/include/xkbrules.h b/xorg-server/include/xkbrules.h index d21731884..956eade0b 100644 --- a/xorg-server/include/xkbrules.h +++ b/xorg-server/include/xkbrules.h @@ -30,40 +30,40 @@ /***====================================================================***/ typedef struct _XkbRMLVOSet { - char *rules; - char *model; - char *layout; - char *variant; - char *options; + const char *rules; + const char *model; + const char *layout; + const char *variant; + const char *options; } XkbRMLVOSet; typedef struct _XkbRF_VarDefs { - char *model; - char *layout; - char *variant; - char *options; + const char *model; + const char *layout; + const char *variant; + const char *options; } XkbRF_VarDefsRec, *XkbRF_VarDefsPtr; typedef struct _XkbRF_Rule { int number; int layout_num; int variant_num; - char *model; - char *layout; - char *variant; - char *option; + const char *model; + const char *layout; + const char *variant; + const char *option; /* yields */ - char *keycodes; - char *symbols; - char *types; - char *compat; - char *geometry; + const char *keycodes; + const char *symbols; + const char *types; + const char *compat; + const char *geometry; unsigned flags; } XkbRF_RuleRec, *XkbRF_RulePtr; typedef struct _XkbRF_Group { int number; - char *name; + const char *name; char *words; } XkbRF_GroupRec, *XkbRF_GroupPtr; diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index 346ebccf0..0b9ca06d9 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -281,7 +281,7 @@ extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec; #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey)) -extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); +extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *); /***====================================================================***/ @@ -600,7 +600,7 @@ extern _X_EXPORT void XkbHandleBell(BOOL /* force */ , BOOL /* eventOnly */ , DeviceIntPtr /* kbd */ , CARD8 /* percent */ , - pointer /* ctrl */ , + void */* ctrl */ , CARD8 /* class */ , Atom /* name */ , WindowPtr /* pWin */ , @@ -852,7 +852,7 @@ extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ , ); extern _X_EXPORT Bool XkbDDXNamesFromRules(DeviceIntPtr /* keybd */ , - char * /* rules */ , + const char * /* rules */ , XkbRF_VarDefsPtr /* defs */ , XkbComponentNamesPtr /* names */ ); |