diff options
Diffstat (limited to 'include/extnsionst.h')
| -rw-r--r-- | include/extnsionst.h | 87 |
1 files changed, 22 insertions, 65 deletions
diff --git a/include/extnsionst.h b/include/extnsionst.h index 6de9be309..0d7debe0b 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H @@ -58,10 +58,7 @@ SOFTWARE. typedef struct _ExtensionEntry { int index; void (* CloseDown)( /* called at server shutdown */ -#if NeedNestedPrototypes - struct _ExtensionEntry * /* extension */ -#endif -); + struct _ExtensionEntry * /* extension */); char *name; /* extension name */ int base; /* base request number */ int eventBase; @@ -72,10 +69,7 @@ typedef struct _ExtensionEntry { char **aliases; pointer extPrivate; unsigned short (* MinorOpcode)( /* called for errors */ -#if NeedNestedPrototypes - ClientPtr /* client */ -#endif -); + ClientPtr /* client */); #ifdef XCSECURITY Bool secure; /* extension visible to untrusted clients? */ #endif @@ -86,25 +80,21 @@ typedef struct _ExtensionEntry { * Deal with this by casting when initializing the event's EventSwapVector[] * entries. */ -typedef void (*EventSwapPtr) ( -#if NeedFunctionPrototypes - xEvent *, - xEvent * -#endif -); +typedef void (*EventSwapPtr) (xEvent *, xEvent *); extern EventSwapPtr EventSwapVector[128]; extern void NotImplemented ( /* FIXME: this may move to another file... */ -#if NeedFunctionPrototypes xEvent *, - xEvent * -#endif -); - -typedef void (* ExtensionLookupProc)( /*args indeterminate*/ -#ifdef EXTENSION_PROC_ARGS - EXTENSION_PROC_ARGS + xEvent *); + +typedef void (* ExtensionLookupProc)( +#ifdef EXTENSION_PROC_ARGS + EXTENSION_PROC_ARGS +#else + /* args no longer indeterminate */ + char *name, + GCPtr pGC #endif ); @@ -125,71 +115,38 @@ typedef struct _ScreenProcEntry { extern ExtensionEntry *AddExtension( -#if NeedFunctionPrototypes char* /*name*/, int /*NumEvents*/, int /*NumErrors*/, - int (* /*MainProc*/)( -#if NeedNestedPrototypes - ClientPtr /*client*/ -#endif -), - int (* /*SwappedMainProc*/)( -#if NeedNestedPrototypes - ClientPtr /*client*/ -#endif -), - void (* /*CloseDownProc*/)( -#if NeedNestedPrototypes - ExtensionEntry * /*extension*/ -#endif -), - unsigned short (* /*MinorOpcodeProc*/)( -#if NeedNestedPrototypes - ClientPtr /*client*/ -#endif - ) -#endif /* NeedFunctionPrototypes */ + int (* /*MainProc*/)(ClientPtr /*client*/), + int (* /*SwappedMainProc*/)(ClientPtr /*client*/), + void (* /*CloseDownProc*/)(ExtensionEntry * /*extension*/), + unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/) ); extern Bool AddExtensionAlias( -#if NeedFunctionPrototypes char* /*alias*/, - ExtensionEntry * /*extension*/ -#endif -); + ExtensionEntry * /*extension*/); extern ExtensionEntry *CheckExtension(const char *extname); extern ExtensionLookupProc LookupProc( -#if NeedFunctionPrototypes char* /*name*/, - GCPtr /*pGC*/ -#endif -); + GCPtr /*pGC*/); extern Bool RegisterProc( -#if NeedFunctionPrototypes char* /*name*/, GCPtr /*pGC*/, - ExtensionLookupProc /*proc*/ -#endif -); + ExtensionLookupProc /*proc*/); extern Bool RegisterScreenProc( -#if NeedFunctionPrototypes char* /*name*/, ScreenPtr /*pScreen*/, - ExtensionLookupProc /*proc*/ -#endif -); + ExtensionLookupProc /*proc*/); extern void DeclareExtensionSecurity( -#if NeedFunctionPrototypes char * /*extname*/, - Bool /*secure*/ -#endif -); + Bool /*secure*/); #endif /* EXTENSIONSTRUCT_H */ |