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:
parent
8b36e1ec8d
commit
5eb77697ea
|
@ -64,16 +64,16 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
|
|||
|
||||
typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
|
||||
|
||||
extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ ,
|
||||
CallbackProcPtr /*callback */ ,
|
||||
void */*data */ );
|
||||
extern _X_EXPORT Bool AddCallback(CallbackListPtr *pcbl,
|
||||
CallbackProcPtr callback,
|
||||
void *data);
|
||||
|
||||
extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ ,
|
||||
CallbackProcPtr /*callback */ ,
|
||||
void */*data */ );
|
||||
extern _X_EXPORT Bool DeleteCallback(CallbackListPtr *pcbl,
|
||||
CallbackProcPtr callback,
|
||||
void *data);
|
||||
|
||||
extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ ,
|
||||
void */*call_data */ );
|
||||
extern _X_EXPORT void _CallCallbacks(CallbackListPtr *pcbl,
|
||||
void *call_data);
|
||||
|
||||
static inline void
|
||||
CallCallbacks(CallbackListPtr *pcbl, void *call_data)
|
||||
|
@ -83,7 +83,7 @@ CallCallbacks(CallbackListPtr *pcbl, void *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 DeleteCallbackManager(void);
|
||||
|
|
|
@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ ,
|
|||
int /*alloc */ ,
|
||||
int /*client */ );
|
||||
|
||||
extern _X_EXPORT int FreeColormap(void */*pmap */ ,
|
||||
XID /*mid */ );
|
||||
extern _X_EXPORT int FreeColormap(void *pmap,
|
||||
XID mid);
|
||||
|
||||
extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ ,
|
||||
void */* Colormap *pmid */ );
|
||||
extern _X_EXPORT int TellLostMap(WindowPtr pwin,
|
||||
void *value);
|
||||
|
||||
extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ ,
|
||||
void */* Colormap *pmid */ );
|
||||
extern _X_EXPORT int TellGainedMap(WindowPtr pwin,
|
||||
void *value);
|
||||
|
||||
extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ ,
|
||||
ColormapPtr /*pSrc */ ,
|
||||
|
@ -126,8 +126,8 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
|
|||
xrgb * /*prgbList */ ,
|
||||
ClientPtr client);
|
||||
|
||||
extern _X_EXPORT int FreeClientPixels(void */*pcr */ ,
|
||||
XID /*fakeid */ );
|
||||
extern _X_EXPORT int FreeClientPixels(void *pcr,
|
||||
XID fakeid);
|
||||
|
||||
extern _X_EXPORT int AllocColorCells(int /*client */ ,
|
||||
ColormapPtr /*pmap */ ,
|
||||
|
|
|
@ -68,8 +68,8 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
|
|||
|
||||
extern _X_EXPORT CursorPtr rootCursor;
|
||||
|
||||
extern _X_EXPORT int FreeCursor(void */*pCurs */ ,
|
||||
XID /*cid */ );
|
||||
extern _X_EXPORT int FreeCursor(void *pCurs,
|
||||
XID cid);
|
||||
|
||||
extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
|
||||
extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */);
|
||||
|
|
|
@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void);
|
|||
|
||||
extern _X_EXPORT void UpdateCurrentTimeIf(void);
|
||||
|
||||
extern _X_EXPORT int dixDestroyPixmap(void */*value */ ,
|
||||
XID /*pid */ );
|
||||
extern _X_EXPORT int dixDestroyPixmap(void *value,
|
||||
XID pid);
|
||||
|
||||
extern _X_EXPORT void InitClient(ClientPtr /*client */ ,
|
||||
int /*i */ ,
|
||||
void */*ospriv */ );
|
||||
extern _X_EXPORT void InitClient(ClientPtr client,
|
||||
int i,
|
||||
void *ospriv);
|
||||
|
||||
extern _X_EXPORT ClientPtr NextAvailableClient(void */*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(void */*pTimeout */ ,
|
||||
void */*pReadmask */ );
|
||||
extern _X_EXPORT void BlockHandler(void *pTimeout,
|
||||
void *pReadmask);
|
||||
|
||||
extern _X_EXPORT void WakeupHandler(int /*result */ ,
|
||||
void */*pReadmask */ );
|
||||
extern _X_EXPORT void WakeupHandler(int result,
|
||||
void *pReadmask);
|
||||
|
||||
void
|
||||
EnableLimitedSchedulingLatency(void);
|
||||
|
@ -215,21 +215,17 @@ void
|
|||
void
|
||||
DisableLimitedSchedulingLatency(void);
|
||||
|
||||
typedef void (*WakeupHandlerProcPtr) (void */* blockData */ ,
|
||||
int /* result */ ,
|
||||
void */* pReadmask */ );
|
||||
typedef void (*WakeupHandlerProcPtr) (void *blockData,
|
||||
int result,
|
||||
void *pReadmask);
|
||||
|
||||
extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr
|
||||
/*blockHandler */ ,
|
||||
WakeupHandlerProcPtr
|
||||
/*wakeupHandler */ ,
|
||||
void */*blockData */ );
|
||||
extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
|
||||
WakeupHandlerProcPtr wakeupHandler,
|
||||
void *blockData);
|
||||
|
||||
extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr
|
||||
/*blockHandler */ ,
|
||||
WakeupHandlerProcPtr
|
||||
/*wakeupHandler */ ,
|
||||
void */*blockData */ );
|
||||
extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
|
||||
WakeupHandlerProcPtr wakeupHandler,
|
||||
void *blockData);
|
||||
|
||||
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 Bool QueueWorkProc(Bool (* /*function */ )(
|
||||
ClientPtr
|
||||
/*clientUnused */
|
||||
,
|
||||
void *
|
||||
/*closure */ ),
|
||||
ClientPtr /*client */ ,
|
||||
void */*closure */
|
||||
);
|
||||
extern _X_EXPORT Bool QueueWorkProc(Bool (*function)(ClientPtr clientUnused,
|
||||
void *closure),
|
||||
ClientPtr client,
|
||||
void *closure);
|
||||
|
||||
typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ ,
|
||||
void */*closure */ );
|
||||
typedef Bool (*ClientSleepProcPtr) (ClientPtr client,
|
||||
void *closure);
|
||||
|
||||
extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ ,
|
||||
ClientSleepProcPtr /* function */ ,
|
||||
void */*closure */ );
|
||||
extern _X_EXPORT Bool ClientSleep(ClientPtr client,
|
||||
ClientSleepProcPtr function,
|
||||
void *closure);
|
||||
|
||||
#ifndef ___CLIENTSIGNAL_DEFINED___
|
||||
#define ___CLIENTSIGNAL_DEFINED___
|
||||
|
@ -444,8 +435,8 @@ extern void
|
|||
RecalculateDeliverableEvents(WindowPtr /* pWin */ );
|
||||
|
||||
extern _X_EXPORT int
|
||||
OtherClientGone(void */* value */ ,
|
||||
XID /* id */ );
|
||||
OtherClientGone(void *value,
|
||||
XID id);
|
||||
|
||||
extern void
|
||||
DoFocusEvents(DeviceIntPtr /* dev */ ,
|
||||
|
|
|
@ -40,9 +40,9 @@ extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
|
|||
|
||||
extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
|
||||
|
||||
extern _X_EXPORT void FontWakeup(void */*data */ ,
|
||||
int /*count */ ,
|
||||
void */*LastSelectMask */ );
|
||||
extern _X_EXPORT void FontWakeup(void *data,
|
||||
int count,
|
||||
void *LastSelectMask);
|
||||
|
||||
extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
|
||||
XID /*fid */ ,
|
||||
|
@ -50,8 +50,8 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
|
|||
unsigned /*lenfname */ ,
|
||||
const char * /*pfontname */ );
|
||||
|
||||
extern _X_EXPORT int CloseFont(void */*pfont */ ,
|
||||
XID /*fid */ );
|
||||
extern _X_EXPORT int CloseFont(void *pfont,
|
||||
XID fid);
|
||||
|
||||
typedef struct _xQueryFontReply *xQueryFontReplyPtr;
|
||||
|
||||
|
|
|
@ -47,8 +47,8 @@ extern GrabPtr CreateGrab(int /* client */ ,
|
|||
WindowPtr /* confineTo */ ,
|
||||
CursorPtr /* cursor */ );
|
||||
|
||||
extern _X_EXPORT int DeletePassiveGrab(void */* value */ ,
|
||||
XID /* id */ );
|
||||
extern _X_EXPORT int DeletePassiveGrab(void *value,
|
||||
XID id);
|
||||
|
||||
extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
|
||||
GrabPtr /* pSecondGrab */ ,
|
||||
|
|
|
@ -112,8 +112,8 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
|
|||
GCPtr /*pgcDst */ ,
|
||||
BITS32 /*mask */ );
|
||||
|
||||
extern _X_EXPORT int FreeGC(void */*pGC */ ,
|
||||
XID /*gid */ );
|
||||
extern _X_EXPORT int FreeGC(void *pGC,
|
||||
XID gid);
|
||||
|
||||
extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );
|
||||
|
||||
|
|
|
@ -76,10 +76,10 @@ typedef struct _GCFuncs {
|
|||
|
||||
void (*DestroyGC) (GCPtr /*pGC */ );
|
||||
|
||||
void (*ChangeClip) (GCPtr /*pGC */ ,
|
||||
int /*type */ ,
|
||||
void */*pvalue */ ,
|
||||
int /*nrects */ );
|
||||
void (*ChangeClip) (GCPtr pGC,
|
||||
int type,
|
||||
void *pvalue,
|
||||
int nrects);
|
||||
|
||||
void (*DestroyClip) (GCPtr /*pGC */ );
|
||||
|
||||
|
@ -210,21 +210,21 @@ typedef struct _GCOps {
|
|||
int /*count */ ,
|
||||
unsigned short * /*chars */ );
|
||||
|
||||
void (*ImageGlyphBlt) (DrawablePtr /*pDrawable */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
int /*x */ ,
|
||||
int /*y */ ,
|
||||
unsigned int /*nglyph */ ,
|
||||
CharInfoPtr * /*ppci */ ,
|
||||
void */*pglyphBase */ );
|
||||
void (*ImageGlyphBlt) (DrawablePtr pDrawable,
|
||||
GCPtr pGC,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int nglyph,
|
||||
CharInfoPtr *ppci,
|
||||
void *pglyphBase);
|
||||
|
||||
void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
int /*x */ ,
|
||||
int /*y */ ,
|
||||
unsigned int /*nglyph */ ,
|
||||
CharInfoPtr * /*ppci */ ,
|
||||
void */*pglyphBase */ );
|
||||
void (*PolyGlyphBlt) (DrawablePtr pDrawable,
|
||||
GCPtr pGC,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int nglyph,
|
||||
CharInfoPtr *ppci,
|
||||
void *pglyphBase);
|
||||
|
||||
void (*PushPixels) (GCPtr /*pGC */ ,
|
||||
PixmapPtr /*pBitMap */ ,
|
||||
|
|
|
@ -314,10 +314,10 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ ,
|
|||
unsigned int /*mode */ ,
|
||||
unsigned int /*numAxes */ );
|
||||
|
||||
typedef void (*BellProcPtr) (int /*percent */ ,
|
||||
DeviceIntPtr /*device */ ,
|
||||
void */*ctrl */ ,
|
||||
int);
|
||||
typedef void (*BellProcPtr) (int percent,
|
||||
DeviceIntPtr device,
|
||||
void *ctrl,
|
||||
int feedbackClass);
|
||||
|
||||
typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ ,
|
||||
KeybdCtrl * /*ctrl */ );
|
||||
|
|
52
include/os.h
52
include/os.h
|
@ -139,8 +139,8 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
|
|||
unsigned int /*string_n */ ,
|
||||
char * /*auth_string */ );
|
||||
|
||||
extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ ,
|
||||
void */*closure */ );
|
||||
extern _X_EXPORT Bool EstablishNewConnections(ClientPtr clientUnused,
|
||||
void *closure);
|
||||
|
||||
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 CARD64 GetTimeInMicros(void);
|
||||
|
||||
extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ ,
|
||||
unsigned long /*newdelay */ );
|
||||
extern _X_EXPORT void AdjustWaitForDelay(void *waitTime,
|
||||
unsigned long newdelay);
|
||||
|
||||
typedef struct _OsTimerRec *OsTimerPtr;
|
||||
|
||||
typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ ,
|
||||
CARD32 /* time */ ,
|
||||
void */* arg */ );
|
||||
typedef CARD32 (*OsTimerCallback) (OsTimerPtr timer,
|
||||
CARD32 time,
|
||||
void *arg);
|
||||
|
||||
extern _X_EXPORT void TimerInit(void);
|
||||
|
||||
|
@ -189,11 +189,11 @@ extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */ );
|
|||
#define TimerAbsolute (1<<0)
|
||||
#define TimerForceOld (1<<1)
|
||||
|
||||
extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ ,
|
||||
int /* flags */ ,
|
||||
CARD32 /* millis */ ,
|
||||
OsTimerCallback /* func */ ,
|
||||
void */* arg */ );
|
||||
extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr timer,
|
||||
int flags,
|
||||
CARD32 millis,
|
||||
OsTimerCallback func,
|
||||
void *arg);
|
||||
|
||||
extern _X_EXPORT void TimerCheck(void);
|
||||
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 int set_font_authorizations(char ** /* authorizations */ ,
|
||||
int * /*authlen */ ,
|
||||
void */* client */ );
|
||||
extern _X_EXPORT int set_font_authorizations(char **authorizations,
|
||||
int *authlen,
|
||||
void *client);
|
||||
|
||||
#ifndef _HAVE_XALLOC_DECLS
|
||||
#define _HAVE_XALLOC_DECLS
|
||||
|
@ -391,18 +391,18 @@ AddHost(ClientPtr /*client */ ,
|
|||
const void * /*pAddr */ );
|
||||
|
||||
extern _X_EXPORT Bool
|
||||
ForEachHostInFamily(int /*family */ ,
|
||||
Bool (* /*func */ )(
|
||||
unsigned char * /* addr */ ,
|
||||
short /* len */ ,
|
||||
void */* closure */ ),
|
||||
void */*closure */ );
|
||||
ForEachHostInFamily(int family,
|
||||
Bool (*func)(
|
||||
unsigned char *addr,
|
||||
short len,
|
||||
void *closure),
|
||||
void *closure);
|
||||
|
||||
extern _X_EXPORT int
|
||||
RemoveHost(ClientPtr /*client */ ,
|
||||
int /*family */ ,
|
||||
unsigned /*length */ ,
|
||||
void */*pAddr */ );
|
||||
RemoveHost(ClientPtr client,
|
||||
int family,
|
||||
unsigned length,
|
||||
void *pAddr);
|
||||
|
||||
extern _X_EXPORT int
|
||||
GetHosts(void ** /*data */ ,
|
||||
|
@ -464,7 +464,7 @@ DefineSelf(int /*fd */ );
|
|||
|
||||
#if XDMCP
|
||||
extern _X_EXPORT void
|
||||
AugmentSelf(void */*from */ , int /*len */ );
|
||||
AugmentSelf(void *from, int len);
|
||||
|
||||
extern _X_EXPORT void
|
||||
RegisterAuthorizations(void);
|
||||
|
|
|
@ -93,13 +93,13 @@ typedef union _PixUnion {
|
|||
#define WindowDrawable(type) \
|
||||
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
|
||||
|
||||
extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ ,
|
||||
int /*width */ ,
|
||||
int /*height */ ,
|
||||
int /*depth */ ,
|
||||
int /*bitsPerPixel */ ,
|
||||
int /*devKind */ ,
|
||||
void */*pPixData */ );
|
||||
extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr pScreen,
|
||||
int width,
|
||||
int height,
|
||||
int depth,
|
||||
int bitsPerPixel,
|
||||
int devKind,
|
||||
void *pPixData);
|
||||
|
||||
extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
|
||||
|
||||
|
|
|
@ -57,24 +57,24 @@ extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
|
|||
ClientPtr /*pClient */ ,
|
||||
Mask /*access_mode */ );
|
||||
|
||||
extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ ,
|
||||
WindowPtr /*pWin */ ,
|
||||
Atom /*property */ ,
|
||||
Atom /*type */ ,
|
||||
int /*format */ ,
|
||||
int /*mode */ ,
|
||||
unsigned long /*len */ ,
|
||||
void */*value */ ,
|
||||
Bool /*sendevent */ );
|
||||
extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
|
||||
WindowPtr pWin,
|
||||
Atom property,
|
||||
Atom type,
|
||||
int format,
|
||||
int mode,
|
||||
unsigned long len,
|
||||
void *value,
|
||||
Bool sendevent);
|
||||
|
||||
extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ ,
|
||||
Atom /*property */ ,
|
||||
Atom /*type */ ,
|
||||
int /*format */ ,
|
||||
int /*mode */ ,
|
||||
unsigned long /*len */ ,
|
||||
void */*value */ ,
|
||||
Bool /*sendevent */ );
|
||||
extern _X_EXPORT int ChangeWindowProperty(WindowPtr pWin,
|
||||
Atom property,
|
||||
Atom type,
|
||||
int format,
|
||||
int mode,
|
||||
unsigned long len,
|
||||
void *value,
|
||||
Bool sendevent);
|
||||
|
||||
extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
|
||||
WindowPtr /*pWin */ ,
|
||||
|
|
|
@ -136,21 +136,21 @@ typedef struct {
|
|||
void *value;
|
||||
} ResourceStateInfoRec;
|
||||
|
||||
typedef int (*DeleteType) (void */*value */ ,
|
||||
XID /*id */ );
|
||||
typedef int (*DeleteType) (void *value,
|
||||
XID id);
|
||||
|
||||
typedef void (*FindResType) (void */*value */ ,
|
||||
XID /*id */ ,
|
||||
void */*cdata */ );
|
||||
typedef void (*FindResType) (void *value,
|
||||
XID id,
|
||||
void *cdata);
|
||||
|
||||
typedef void (*FindAllRes) (void */*value */ ,
|
||||
XID /*id */ ,
|
||||
RESTYPE /*type */ ,
|
||||
void */*cdata */ );
|
||||
typedef void (*FindAllRes) (void *value,
|
||||
XID id,
|
||||
RESTYPE type,
|
||||
void *cdata);
|
||||
|
||||
typedef Bool (*FindComplexResType) (void */*value */ ,
|
||||
XID /*id */ ,
|
||||
void */*cdata */ );
|
||||
typedef Bool (*FindComplexResType) (void *value,
|
||||
XID id,
|
||||
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)(void */*value*/,
|
||||
XID /*id*/,
|
||||
ResourceSizePtr /*size*/);
|
||||
typedef void (*SizeType)(void *value,
|
||||
XID id,
|
||||
ResourceSizePtr size);
|
||||
|
||||
extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ ,
|
||||
const char * /*name */ );
|
||||
extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType deleteFunc,
|
||||
const char *name);
|
||||
|
||||
typedef void (*FindTypeSubResources)(void */* value */,
|
||||
FindAllRes /* func */,
|
||||
void */* cdata */);
|
||||
typedef void (*FindTypeSubResources)(void *value,
|
||||
FindAllRes func,
|
||||
void *cdata);
|
||||
|
||||
extern _X_EXPORT SizeType GetResourceTypeSizeFunc(
|
||||
RESTYPE /*type*/);
|
||||
|
@ -200,9 +200,9 @@ extern _X_EXPORT XID FakeClientID(int /*client */ );
|
|||
#ifdef __APPLE__
|
||||
#define AddResource Darwin_X_AddResource
|
||||
#endif
|
||||
extern _X_EXPORT Bool AddResource(XID /*id */ ,
|
||||
RESTYPE /*type */ ,
|
||||
void */*value */ );
|
||||
extern _X_EXPORT Bool AddResource(XID id,
|
||||
RESTYPE type,
|
||||
void *value);
|
||||
|
||||
extern _X_EXPORT void FreeResource(XID /*id */ ,
|
||||
RESTYPE /*skipDeleteFuncType */ );
|
||||
|
@ -211,27 +211,27 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ ,
|
|||
RESTYPE /*type */ ,
|
||||
Bool /*skipFree */ );
|
||||
|
||||
extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ ,
|
||||
RESTYPE /*rtype */ ,
|
||||
void */*value */ );
|
||||
extern _X_EXPORT Bool ChangeResourceValue(XID id,
|
||||
RESTYPE rtype,
|
||||
void *value);
|
||||
|
||||
extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ ,
|
||||
RESTYPE /*type */ ,
|
||||
FindResType /*func */ ,
|
||||
void */*cdata */ );
|
||||
extern _X_EXPORT void FindClientResourcesByType(ClientPtr client,
|
||||
RESTYPE type,
|
||||
FindResType func,
|
||||
void *cdata);
|
||||
|
||||
extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ ,
|
||||
FindAllRes /*func */ ,
|
||||
void */*cdata */ );
|
||||
extern _X_EXPORT void FindAllClientResources(ClientPtr client,
|
||||
FindAllRes func,
|
||||
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(void */*resource*/,
|
||||
RESTYPE /*type*/,
|
||||
FindAllRes /*func*/,
|
||||
void */*cdata*/);
|
||||
extern _X_EXPORT void FindSubResources(void *resource,
|
||||
RESTYPE type,
|
||||
FindAllRes func,
|
||||
void *cdata);
|
||||
|
||||
extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ );
|
||||
|
||||
|
|
|
@ -259,23 +259,23 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
|
|||
int /*major */ ,
|
||||
int /*minor */ );
|
||||
|
||||
typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
|
||||
void */*pTimeout */ ,
|
||||
void */*pReadmask */ );
|
||||
typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr pScreen,
|
||||
void *pTimeout,
|
||||
void *pReadmask);
|
||||
|
||||
typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
|
||||
unsigned long /*result */ ,
|
||||
void */*pReadMask */ );
|
||||
typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr pScreen,
|
||||
unsigned long result,
|
||||
void *pReadMask);
|
||||
|
||||
typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ );
|
||||
|
||||
typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ ,
|
||||
int /*width */ ,
|
||||
int /*height */ ,
|
||||
int /*depth */ ,
|
||||
int /*bitsPerPixel */ ,
|
||||
int /*devKind */ ,
|
||||
void */*pPixData */ );
|
||||
typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr pPixmap,
|
||||
int width,
|
||||
int height,
|
||||
int depth,
|
||||
int bitsPerPixel,
|
||||
int devKind,
|
||||
void *pPixData);
|
||||
|
||||
typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ );
|
||||
|
||||
|
|
|
@ -72,16 +72,16 @@ struct _Cursor;
|
|||
typedef struct _BackingStore *BackingStorePtr;
|
||||
typedef struct _Window *WindowPtr;
|
||||
|
||||
typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ ,
|
||||
void */*data */ );
|
||||
typedef int (*VisitWindowProcPtr) (WindowPtr pWin,
|
||||
void *data);
|
||||
|
||||
extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ ,
|
||||
VisitWindowProcPtr /*func */ ,
|
||||
void */*data */ );
|
||||
extern _X_EXPORT int TraverseTree(WindowPtr pWin,
|
||||
VisitWindowProcPtr func,
|
||||
void *data);
|
||||
|
||||
extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ ,
|
||||
VisitWindowProcPtr /*func */ ,
|
||||
void */*data */ );
|
||||
extern _X_EXPORT int WalkTree(ScreenPtr pScreen,
|
||||
VisitWindowProcPtr func,
|
||||
void *data);
|
||||
|
||||
extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ );
|
||||
|
||||
|
@ -108,8 +108,8 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
|
|||
VisualID /*visual */ ,
|
||||
int * /*error */ );
|
||||
|
||||
extern _X_EXPORT int DeleteWindow(void */*pWin */ ,
|
||||
XID /*wid */ );
|
||||
extern _X_EXPORT int DeleteWindow(void *pWin,
|
||||
XID wid);
|
||||
|
||||
extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ ,
|
||||
ClientPtr /*client */ );
|
||||
|
|
|
@ -596,15 +596,15 @@ extern _X_EXPORT void XkbSendCompatMapNotify(DeviceIntPtr /* kbd */ ,
|
|||
xkbCompatMapNotify * /* ev */
|
||||
);
|
||||
|
||||
extern _X_EXPORT void XkbHandleBell(BOOL /* force */ ,
|
||||
BOOL /* eventOnly */ ,
|
||||
DeviceIntPtr /* kbd */ ,
|
||||
CARD8 /* percent */ ,
|
||||
void */* ctrl */ ,
|
||||
CARD8 /* class */ ,
|
||||
Atom /* name */ ,
|
||||
WindowPtr /* pWin */ ,
|
||||
ClientPtr /* pClient */
|
||||
extern _X_EXPORT void XkbHandleBell(BOOL force,
|
||||
BOOL eventOnly,
|
||||
DeviceIntPtr kbd,
|
||||
CARD8 percent,
|
||||
void *ctrl,
|
||||
CARD8 class,
|
||||
Atom name,
|
||||
WindowPtr pWin,
|
||||
ClientPtr pClient
|
||||
);
|
||||
|
||||
extern _X_EXPORT void XkbSendAccessXNotify(DeviceIntPtr /* kbd */ ,
|
||||
|
|
74
mi/mi.h
74
mi/mi.h
|
@ -265,22 +265,22 @@ extern _X_EXPORT void miPolyFillRect(DrawablePtr /*pDrawable */ ,
|
|||
|
||||
/* miglblt.c */
|
||||
|
||||
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
int /*x */ ,
|
||||
int /*y */ ,
|
||||
unsigned int /*nglyph */ ,
|
||||
CharInfoPtr * /*ppci */ ,
|
||||
void */*pglyphBase */
|
||||
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr pDrawable,
|
||||
GCPtr pGC,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int nglyph,
|
||||
CharInfoPtr *ppci,
|
||||
void *pglyphBase
|
||||
);
|
||||
|
||||
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
|
||||
GCPtr /*pGC */ ,
|
||||
int /*x */ ,
|
||||
int /*y */ ,
|
||||
unsigned int /*nglyph */ ,
|
||||
CharInfoPtr * /*ppci */ ,
|
||||
void */*pglyphBase */
|
||||
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr pDrawable,
|
||||
GCPtr pGC,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int nglyph,
|
||||
CharInfoPtr *ppci,
|
||||
void *pglyphBase
|
||||
);
|
||||
|
||||
/* mipoly.c */
|
||||
|
@ -381,36 +381,36 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ ,
|
|||
|
||||
/* miscrinit.c */
|
||||
|
||||
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ ,
|
||||
int /*width */ ,
|
||||
int /*height */ ,
|
||||
int /*depth */ ,
|
||||
int /*bitsPerPixel */ ,
|
||||
int /*devKind */ ,
|
||||
void */*pPixData */
|
||||
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
|
||||
int width,
|
||||
int height,
|
||||
int depth,
|
||||
int bitsPerPixel,
|
||||
int devKind,
|
||||
void *pPixData
|
||||
);
|
||||
|
||||
extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
|
||||
);
|
||||
|
||||
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ ,
|
||||
int /*width */ ,
|
||||
void */*pbits */
|
||||
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr pScreen,
|
||||
int width,
|
||||
void *pbits
|
||||
);
|
||||
|
||||
extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ ,
|
||||
void */*pbits */ ,
|
||||
int /*xsize */ ,
|
||||
int /*ysize */ ,
|
||||
int /*dpix */ ,
|
||||
int /*dpiy */ ,
|
||||
int /*width */ ,
|
||||
int /*rootDepth */ ,
|
||||
int /*numDepths */ ,
|
||||
DepthPtr /*depths */ ,
|
||||
VisualID /*rootVisual */ ,
|
||||
int /*numVisuals */ ,
|
||||
VisualPtr /*visuals */
|
||||
extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
|
||||
void *pbits,
|
||||
int xsize,
|
||||
int ysize,
|
||||
int dpix,
|
||||
int dpiy,
|
||||
int width,
|
||||
int rootDepth,
|
||||
int numDepths,
|
||||
DepthPtr depths,
|
||||
VisualID rootVisual,
|
||||
int numVisuals,
|
||||
VisualPtr visuals
|
||||
);
|
||||
|
||||
/* mivaltree.c */
|
||||
|
|
|
@ -1217,9 +1217,9 @@ AddHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
|
|||
}
|
||||
|
||||
Bool
|
||||
ForEachHostInFamily(int family, Bool (*func) (unsigned char * /* addr */ ,
|
||||
short /* len */ ,
|
||||
void */* closure */ ),
|
||||
ForEachHostInFamily(int family, Bool (*func) (unsigned char *addr,
|
||||
short len,
|
||||
void *closure),
|
||||
void *closure)
|
||||
{
|
||||
HOST *host;
|
||||
|
|
Loading…
Reference in New Issue