andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid starting a comment with */* 

Even though -Wcomment doesn't mind it (in gcc or clang), the appearance
of */* confuses the syntax highlighter of some editors (eg. vim), and
causes warnings in MSVC.

Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Harris 2014-03-10 18:31:33 -04:00 committed by Keith Packard
parent 8b36e1ec8d
commit 5eb77697ea
18 changed files with 239 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/callback.h
View File

@ -64,16 +64,16 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *); typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ , extern _X_EXPORT Bool AddCallback(CallbackListPtr *pcbl,
CallbackProcPtr /*callback */ , CallbackProcPtr callback,
void */*data */ ); void *data);
extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ , extern _X_EXPORT Bool DeleteCallback(CallbackListPtr *pcbl,
CallbackProcPtr /*callback */ , CallbackProcPtr callback,
void */*data */ ); void *data);
extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ , extern _X_EXPORT void _CallCallbacks(CallbackListPtr *pcbl,
void */*call_data */ ); void *call_data);
static inline void static inline void
CallCallbacks(CallbackListPtr *pcbl, void *call_data) CallCallbacks(CallbackListPtr *pcbl, void *call_data)
@ -83,7 +83,7 @@ CallCallbacks(CallbackListPtr *pcbl, void *call_data)
_CallCallbacks(pcbl, call_data); _CallCallbacks(pcbl, call_data);
} }
extern _X_EXPORT void DeleteCallbackList(CallbackListPtr * /*pcbl */ ); extern _X_EXPORT void DeleteCallbackList(CallbackListPtr *pcbl);
extern _X_EXPORT void InitCallbackManager(void); extern _X_EXPORT void InitCallbackManager(void);
extern _X_EXPORT void DeleteCallbackManager(void); extern _X_EXPORT void DeleteCallbackManager(void);

16
include/colormap.h
View File

@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ ,
int /*alloc */ , int /*alloc */ ,
int /*client */ ); int /*client */ );
extern _X_EXPORT int FreeColormap(void */*pmap */ , extern _X_EXPORT int FreeColormap(void *pmap,
XID /*mid */ ); XID mid);
extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ , extern _X_EXPORT int TellLostMap(WindowPtr pwin,
void */* Colormap *pmid */ ); void *value);
extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ , extern _X_EXPORT int TellGainedMap(WindowPtr pwin,
void */* Colormap *pmid */ ); void *value);
extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ , extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ ,
ColormapPtr /*pSrc */ , ColormapPtr /*pSrc */ ,
@ -126,8 +126,8 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
xrgb * /*prgbList */ , xrgb * /*prgbList */ ,
ClientPtr client); ClientPtr client);
extern _X_EXPORT int FreeClientPixels(void */*pcr */ , extern _X_EXPORT int FreeClientPixels(void *pcr,
XID /*fakeid */ ); XID fakeid);
extern _X_EXPORT int AllocColorCells(int /*client */ , extern _X_EXPORT int AllocColorCells(int /*client */ ,
ColormapPtr /*pmap */ , ColormapPtr /*pmap */ ,

4
include/cursor.h
View File

@ -68,8 +68,8 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
extern _X_EXPORT CursorPtr rootCursor; extern _X_EXPORT CursorPtr rootCursor;
extern _X_EXPORT int FreeCursor(void */*pCurs */ , extern _X_EXPORT int FreeCursor(void *pCurs,
XID /*cid */ ); XID cid);
extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */); extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */); extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */);

69
include/dix.h
View File

@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void);
extern _X_EXPORT void UpdateCurrentTimeIf(void); extern _X_EXPORT void UpdateCurrentTimeIf(void);
extern _X_EXPORT int dixDestroyPixmap(void */*value */ , extern _X_EXPORT int dixDestroyPixmap(void *value,
XID /*pid */ ); XID pid);
extern _X_EXPORT void InitClient(ClientPtr /*client */ , extern _X_EXPORT void InitClient(ClientPtr client,
int /*i */ , int i,
void */*ospriv */ ); void *ospriv);
extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ ); extern _X_EXPORT ClientPtr NextAvailableClient(void *ospriv);
extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ , extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ ,
unsigned int /*majorCode */ , 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 DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ );
extern _X_EXPORT void BlockHandler(void */*pTimeout */ , extern _X_EXPORT void BlockHandler(void *pTimeout,
void */*pReadmask */ ); void *pReadmask);
extern _X_EXPORT void WakeupHandler(int /*result */ , extern _X_EXPORT void WakeupHandler(int result,
void */*pReadmask */ ); void *pReadmask);
void void
EnableLimitedSchedulingLatency(void); EnableLimitedSchedulingLatency(void);
@ -215,21 +215,17 @@ void
void void
DisableLimitedSchedulingLatency(void); DisableLimitedSchedulingLatency(void);
typedef void (*WakeupHandlerProcPtr) (void */* blockData */ , typedef void (*WakeupHandlerProcPtr) (void *blockData,
int /* result */ , int result,
void */* pReadmask */ ); void *pReadmask);
extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
/*blockHandler */ , WakeupHandlerProcPtr wakeupHandler,
WakeupHandlerProcPtr void *blockData);
/*wakeupHandler */ ,
void */*blockData */ );
extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
/*blockHandler */ , WakeupHandlerProcPtr wakeupHandler,
WakeupHandlerProcPtr void *blockData);
/*wakeupHandler */ ,
void */*blockData */ );
extern _X_EXPORT void InitBlockAndWakeupHandlers(void); extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
@ -237,22 +233,17 @@ extern _X_EXPORT void ProcessWorkQueue(void);
extern _X_EXPORT void ProcessWorkQueueZombies(void); extern _X_EXPORT void ProcessWorkQueueZombies(void);
extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )( extern _X_EXPORT Bool QueueWorkProc(Bool (*function)(ClientPtr clientUnused,
ClientPtr void *closure),
/*clientUnused */ ClientPtr client,
, void *closure);
void *
/*closure */ ),
ClientPtr /*client */ ,
void */*closure */
);
typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ , typedef Bool (*ClientSleepProcPtr) (ClientPtr client,
void */*closure */ ); void *closure);
extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ , extern _X_EXPORT Bool ClientSleep(ClientPtr client,
ClientSleepProcPtr /* function */ , ClientSleepProcPtr function,
void */*closure */ ); void *closure);
#ifndef ___CLIENTSIGNAL_DEFINED___ #ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___ #define ___CLIENTSIGNAL_DEFINED___
@ -444,8 +435,8 @@ extern void
RecalculateDeliverableEvents(WindowPtr /* pWin */ ); RecalculateDeliverableEvents(WindowPtr /* pWin */ );
extern _X_EXPORT int extern _X_EXPORT int
OtherClientGone(void */* value */ , OtherClientGone(void *value,
XID /* id */ ); XID id);
extern void extern void
DoFocusEvents(DeviceIntPtr /* dev */ , DoFocusEvents(DeviceIntPtr /* dev */ ,

10
include/dixfont.h
View File

@ -40,9 +40,9 @@ extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ ); extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
extern _X_EXPORT void FontWakeup(void */*data */ , extern _X_EXPORT void FontWakeup(void *data,
int /*count */ , int count,
void */*LastSelectMask */ ); void *LastSelectMask);
extern _X_EXPORT int OpenFont(ClientPtr /*client */ , extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
XID /*fid */ , XID /*fid */ ,
@ -50,8 +50,8 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
unsigned /*lenfname */ , unsigned /*lenfname */ ,
const char * /*pfontname */ ); const char * /*pfontname */ );
extern _X_EXPORT int CloseFont(void */*pfont */ , extern _X_EXPORT int CloseFont(void *pfont,
XID /*fid */ ); XID fid);
typedef struct _xQueryFontReply *xQueryFontReplyPtr; typedef struct _xQueryFontReply *xQueryFontReplyPtr;

4
include/dixgrabs.h
View File

@ -47,8 +47,8 @@ extern GrabPtr CreateGrab(int /* client */ ,
WindowPtr /* confineTo */ , WindowPtr /* confineTo */ ,
CursorPtr /* cursor */ ); CursorPtr /* cursor */ );
extern _X_EXPORT int DeletePassiveGrab(void */* value */ , extern _X_EXPORT int DeletePassiveGrab(void *value,
XID /* id */ ); XID id);
extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ , extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
GrabPtr /* pSecondGrab */ , GrabPtr /* pSecondGrab */ ,

4
include/gc.h
View File

@ -112,8 +112,8 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
GCPtr /*pgcDst */ , GCPtr /*pgcDst */ ,
BITS32 /*mask */ ); BITS32 /*mask */ );
extern _X_EXPORT int FreeGC(void */*pGC */ , extern _X_EXPORT int FreeGC(void *pGC,
XID /*gid */ ); XID gid);
extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ ); extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );

36
include/gcstruct.h
View File

@ -76,10 +76,10 @@ typedef struct _GCFuncs {
void (*DestroyGC) (GCPtr /*pGC */ ); void (*DestroyGC) (GCPtr /*pGC */ );
void (*ChangeClip) (GCPtr /*pGC */ , void (*ChangeClip) (GCPtr pGC,
int /*type */ , int type,
void */*pvalue */ , void *pvalue,
int /*nrects */ ); int nrects);
void (*DestroyClip) (GCPtr /*pGC */ ); void (*DestroyClip) (GCPtr /*pGC */ );
@ -210,21 +210,21 @@ typedef struct _GCOps {
int /*count */ , int /*count */ ,
unsigned short * /*chars */ ); unsigned short * /*chars */ );
void (*ImageGlyphBlt) (DrawablePtr /*pDrawable */ , void (*ImageGlyphBlt) (DrawablePtr pDrawable,
GCPtr /*pGC */ , GCPtr pGC,
int /*x */ , int x,
int /*y */ , int y,
unsigned int /*nglyph */ , unsigned int nglyph,
CharInfoPtr * /*ppci */ , CharInfoPtr *ppci,
void */*pglyphBase */ ); void *pglyphBase);
void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ , void (*PolyGlyphBlt) (DrawablePtr pDrawable,
GCPtr /*pGC */ , GCPtr pGC,
int /*x */ , int x,
int /*y */ , int y,
unsigned int /*nglyph */ , unsigned int nglyph,
CharInfoPtr * /*ppci */ , CharInfoPtr *ppci,
void */*pglyphBase */ ); void *pglyphBase);
void (*PushPixels) (GCPtr /*pGC */ , void (*PushPixels) (GCPtr /*pGC */ ,
PixmapPtr /*pBitMap */ , PixmapPtr /*pBitMap */ ,

8
include/input.h
View File

@ -314,10 +314,10 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ ,
unsigned int /*mode */ , unsigned int /*mode */ ,
unsigned int /*numAxes */ ); unsigned int /*numAxes */ );
typedef void (*BellProcPtr) (int /*percent */ , typedef void (*BellProcPtr) (int percent,
DeviceIntPtr /*device */ , DeviceIntPtr device,
void */*ctrl */ , void *ctrl,
int); int feedbackClass);
typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ , typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ ,
KeybdCtrl * /*ctrl */ ); KeybdCtrl * /*ctrl */ );

52
include/os.h
View File

@ -139,8 +139,8 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
unsigned int /*string_n */ , unsigned int /*string_n */ ,
char * /*auth_string */ ); char * /*auth_string */ );
extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ , extern _X_EXPORT Bool EstablishNewConnections(ClientPtr clientUnused,
void */*closure */ ); void *closure);
extern _X_EXPORT void CheckConnections(void); extern _X_EXPORT void CheckConnections(void);
@ -173,14 +173,14 @@ extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
extern _X_EXPORT CARD32 GetTimeInMillis(void); extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void); extern _X_EXPORT CARD64 GetTimeInMicros(void);
extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ , extern _X_EXPORT void AdjustWaitForDelay(void *waitTime,
unsigned long /*newdelay */ ); unsigned long newdelay);
typedef struct _OsTimerRec *OsTimerPtr; typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ , typedef CARD32 (*OsTimerCallback) (OsTimerPtr timer,
CARD32 /* time */ , CARD32 time,
void */* arg */ ); void *arg);
extern _X_EXPORT void TimerInit(void); extern _X_EXPORT void TimerInit(void);
@ -189,11 +189,11 @@ extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */ );
#define TimerAbsolute (1<<0) #define TimerAbsolute (1<<0)
#define TimerForceOld (1<<1) #define TimerForceOld (1<<1)
extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ , extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr timer,
int /* flags */ , int flags,
CARD32 /* millis */ , CARD32 millis,
OsTimerCallback /* func */ , OsTimerCallback func,
void */* arg */ ); void *arg);
extern _X_EXPORT void TimerCheck(void); extern _X_EXPORT void TimerCheck(void);
extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ ); extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
@ -210,9 +210,9 @@ extern _X_EXPORT void UseMsg(void);
extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []); extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []);
extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ , extern _X_EXPORT int set_font_authorizations(char **authorizations,
int * /*authlen */ , int *authlen,
void */* client */ ); void *client);
#ifndef _HAVE_XALLOC_DECLS #ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS
@ -391,18 +391,18 @@ AddHost(ClientPtr /*client */ ,
const void * /*pAddr */ ); const void * /*pAddr */ );
extern _X_EXPORT Bool extern _X_EXPORT Bool
ForEachHostInFamily(int /*family */ , ForEachHostInFamily(int family,
Bool (* /*func */ )( Bool (*func)(
unsigned char * /* addr */ , unsigned char *addr,
short /* len */ , short len,
void */* closure */ ), void *closure),
void */*closure */ ); void *closure);
extern _X_EXPORT int extern _X_EXPORT int
RemoveHost(ClientPtr /*client */ , RemoveHost(ClientPtr client,
int /*family */ , int family,
unsigned /*length */ , unsigned length,
void */*pAddr */ ); void *pAddr);
extern _X_EXPORT int extern _X_EXPORT int
GetHosts(void ** /*data */ , GetHosts(void ** /*data */ ,
@ -464,7 +464,7 @@ DefineSelf(int /*fd */ );
#if XDMCP #if XDMCP
extern _X_EXPORT void extern _X_EXPORT void
AugmentSelf(void */*from */ , int /*len */ ); AugmentSelf(void *from, int len);
extern _X_EXPORT void extern _X_EXPORT void
RegisterAuthorizations(void); RegisterAuthorizations(void);

14
include/pixmap.h
View File

@ -93,13 +93,13 @@ typedef union _PixUnion {
#define WindowDrawable(type) \ #define WindowDrawable(type) \
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW)) ((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ , extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr pScreen,
int /*width */ , int width,
int /*height */ , int height,
int /*depth */ , int depth,
int /*bitsPerPixel */ , int bitsPerPixel,
int /*devKind */ , int devKind,
void */*pPixData */ ); void *pPixData);
extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ ); extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );

34
include/property.h
View File

@ -57,24 +57,24 @@ extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
ClientPtr /*pClient */ , ClientPtr /*pClient */ ,
Mask /*access_mode */ ); Mask /*access_mode */ );
extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ , extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
WindowPtr /*pWin */ , WindowPtr pWin,
Atom /*property */ , Atom property,
Atom /*type */ , Atom type,
int /*format */ , int format,
int /*mode */ , int mode,
unsigned long /*len */ , unsigned long len,
void */*value */ , void *value,
Bool /*sendevent */ ); Bool sendevent);
extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ , extern _X_EXPORT int ChangeWindowProperty(WindowPtr pWin,
Atom /*property */ , Atom property,
Atom /*type */ , Atom type,
int /*format */ , int format,
int /*mode */ , int mode,
unsigned long /*len */ , unsigned long len,
void */*value */ , void *value,
Bool /*sendevent */ ); Bool sendevent);
extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ , extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
WindowPtr /*pWin */ , WindowPtr /*pWin */ ,

74
include/resource.h
View File

@ -136,21 +136,21 @@ typedef struct {
void *value; void *value;
} ResourceStateInfoRec; } ResourceStateInfoRec;
typedef int (*DeleteType) (void */*value */ , typedef int (*DeleteType) (void *value,
XID /*id */ ); XID id);
typedef void (*FindResType) (void */*value */ , typedef void (*FindResType) (void *value,
XID /*id */ , XID id,
void */*cdata */ ); void *cdata);
typedef void (*FindAllRes) (void */*value */ , typedef void (*FindAllRes) (void *value,
XID /*id */ , XID id,
RESTYPE /*type */ , RESTYPE type,
void */*cdata */ ); void *cdata);
typedef Bool (*FindComplexResType) (void */*value */ , typedef Bool (*FindComplexResType) (void *value,
XID /*id */ , XID id,
void */*cdata */ ); void *cdata);
/* Structure for estimating resource memory usage. Memory usage /* Structure for estimating resource memory usage. Memory usage
* consists of space allocated for the resource itself and of * consists of space allocated for the resource itself and of
@ -166,16 +166,16 @@ typedef struct {
unsigned long refCnt; unsigned long refCnt;
} ResourceSizeRec, *ResourceSizePtr; } ResourceSizeRec, *ResourceSizePtr;
typedef void (*SizeType)(void */*value*/, typedef void (*SizeType)(void *value,
XID /*id*/, XID id,
ResourceSizePtr /*size*/); ResourceSizePtr size);
extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ , extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType deleteFunc,
const char * /*name */ ); const char *name);
typedef void (*FindTypeSubResources)(void */* value */, typedef void (*FindTypeSubResources)(void *value,
FindAllRes /* func */, FindAllRes func,
void */* cdata */); void *cdata);
extern _X_EXPORT SizeType GetResourceTypeSizeFunc( extern _X_EXPORT SizeType GetResourceTypeSizeFunc(
RESTYPE /*type*/); RESTYPE /*type*/);
@ -200,9 +200,9 @@ extern _X_EXPORT XID FakeClientID(int /*client */ );
#ifdef __APPLE__ #ifdef __APPLE__
#define AddResource Darwin_X_AddResource #define AddResource Darwin_X_AddResource
#endif #endif
extern _X_EXPORT Bool AddResource(XID /*id */ , extern _X_EXPORT Bool AddResource(XID id,
RESTYPE /*type */ , RESTYPE type,
void */*value */ ); void *value);
extern _X_EXPORT void FreeResource(XID /*id */ , extern _X_EXPORT void FreeResource(XID /*id */ ,
RESTYPE /*skipDeleteFuncType */ ); RESTYPE /*skipDeleteFuncType */ );
@ -211,27 +211,27 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ ,
RESTYPE /*type */ , RESTYPE /*type */ ,
Bool /*skipFree */ ); Bool /*skipFree */ );
extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ , extern _X_EXPORT Bool ChangeResourceValue(XID id,
RESTYPE /*rtype */ , RESTYPE rtype,
void */*value */ ); void *value);
extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ , extern _X_EXPORT void FindClientResourcesByType(ClientPtr client,
RESTYPE /*type */ , RESTYPE type,
FindResType /*func */ , FindResType func,
void */*cdata */ ); void *cdata);
extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ , extern _X_EXPORT void FindAllClientResources(ClientPtr client,
FindAllRes /*func */ , FindAllRes func,
void */*cdata */ ); void *cdata);
/** @brief Iterate through all subresources of a resource. /** @brief Iterate through all subresources of a resource.
@note The XID argument provided to the FindAllRes function @note The XID argument provided to the FindAllRes function
may be 0 for subresources that don't have an XID */ may be 0 for subresources that don't have an XID */
extern _X_EXPORT void FindSubResources(void */*resource*/, extern _X_EXPORT void FindSubResources(void *resource,
RESTYPE /*type*/, RESTYPE type,
FindAllRes /*func*/, FindAllRes func,
void */*cdata*/); void *cdata);
extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ ); extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ );

26
include/scrnintstr.h
View File

@ -259,23 +259,23 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
int /*major */ , int /*major */ ,
int /*minor */ ); int /*minor */ );
typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ , typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr pScreen,
void */*pTimeout */ , void *pTimeout,
void */*pReadmask */ ); void *pReadmask);
typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ , typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr pScreen,
unsigned long /*result */ , unsigned long result,
void */*pReadMask */ ); void *pReadMask);
typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ ); typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ );
typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ , typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr pPixmap,
int /*width */ , int width,
int /*height */ , int height,
int /*depth */ , int depth,
int /*bitsPerPixel */ , int bitsPerPixel,
int /*devKind */ , int devKind,
void */*pPixData */ ); void *pPixData);
typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ ); typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ );

20
include/window.h
View File

@ -72,16 +72,16 @@ struct _Cursor;
typedef struct _BackingStore *BackingStorePtr; typedef struct _BackingStore *BackingStorePtr;
typedef struct _Window *WindowPtr; typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ , typedef int (*VisitWindowProcPtr) (WindowPtr pWin,
void */*data */ ); void *data);
extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ , extern _X_EXPORT int TraverseTree(WindowPtr pWin,
VisitWindowProcPtr /*func */ , VisitWindowProcPtr func,
void */*data */ ); void *data);
extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ , extern _X_EXPORT int WalkTree(ScreenPtr pScreen,
VisitWindowProcPtr /*func */ , VisitWindowProcPtr func,
void */*data */ ); void *data);
extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ ); extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ );
@ -108,8 +108,8 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
VisualID /*visual */ , VisualID /*visual */ ,
int * /*error */ ); int * /*error */ );
extern _X_EXPORT int DeleteWindow(void */*pWin */ , extern _X_EXPORT int DeleteWindow(void *pWin,
XID /*wid */ ); XID wid);
extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ , extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ ,
ClientPtr /*client */ ); ClientPtr /*client */ );

18
include/xkbsrv.h
View File

@ -596,15 +596,15 @@ extern _X_EXPORT void XkbSendCompatMapNotify(DeviceIntPtr /* kbd */ ,
xkbCompatMapNotify * /* ev */ xkbCompatMapNotify * /* ev */
); );
extern _X_EXPORT void XkbHandleBell(BOOL /* force */ , extern _X_EXPORT void XkbHandleBell(BOOL force,
BOOL /* eventOnly */ , BOOL eventOnly,
DeviceIntPtr /* kbd */ , DeviceIntPtr kbd,
CARD8 /* percent */ , CARD8 percent,
void */* ctrl */ , void *ctrl,
CARD8 /* class */ , CARD8 class,
Atom /* name */ , Atom name,
WindowPtr /* pWin */ , WindowPtr pWin,
ClientPtr /* pClient */ ClientPtr pClient
); );
extern _X_EXPORT void XkbSendAccessXNotify(DeviceIntPtr /* kbd */ , extern _X_EXPORT void XkbSendAccessXNotify(DeviceIntPtr /* kbd */ ,

74
mi/mi.h
View File

@ -265,22 +265,22 @@ extern _X_EXPORT void miPolyFillRect(DrawablePtr /*pDrawable */ ,
/* miglblt.c */ /* miglblt.c */
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ , extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr /*pGC */ , GCPtr pGC,
int /*x */ , int x,
int /*y */ , int y,
unsigned int /*nglyph */ , unsigned int nglyph,
CharInfoPtr * /*ppci */ , CharInfoPtr *ppci,
void */*pglyphBase */ void *pglyphBase
); );
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ , extern _X_EXPORT void miImageGlyphBlt(DrawablePtr pDrawable,
GCPtr /*pGC */ , GCPtr pGC,
int /*x */ , int x,
int /*y */ , int y,
unsigned int /*nglyph */ , unsigned int nglyph,
CharInfoPtr * /*ppci */ , CharInfoPtr *ppci,
void */*pglyphBase */ void *pglyphBase
); );
/* mipoly.c */ /* mipoly.c */
@ -381,36 +381,36 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ ,
/* miscrinit.c */ /* miscrinit.c */
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ , extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
int /*width */ , int width,
int /*height */ , int height,
int /*depth */ , int depth,
int /*bitsPerPixel */ , int bitsPerPixel,
int /*devKind */ , int devKind,
void */*pPixData */ void *pPixData
); );
extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */ extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
); );
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ , extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr pScreen,
int /*width */ , int width,
void */*pbits */ void *pbits
); );
extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ , extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
void */*pbits */ , void *pbits,
int /*xsize */ , int xsize,
int /*ysize */ , int ysize,
int /*dpix */ , int dpix,
int /*dpiy */ , int dpiy,
int /*width */ , int width,
int /*rootDepth */ , int rootDepth,
int /*numDepths */ , int numDepths,
DepthPtr /*depths */ , DepthPtr depths,
VisualID /*rootVisual */ , VisualID rootVisual,
int /*numVisuals */ , int numVisuals,
VisualPtr /*visuals */ VisualPtr visuals
); );
/* mivaltree.c */ /* mivaltree.c */

6
os/access.c
View File

@ -1217,9 +1217,9 @@ AddHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
} }
Bool Bool
ForEachHostInFamily(int family, Bool (*func) (unsigned char * /* addr */ , ForEachHostInFamily(int family, Bool (*func) (unsigned char *addr,
short /* len */ , short len,
void */* closure */ ), void *closure),
void *closure) void *closure)
{ {
HOST *host; HOST *host;