diff options
Diffstat (limited to 'include/extnsionst.h')
| -rw-r--r-- | include/extnsionst.h | 136 |
1 files changed, 24 insertions, 112 deletions
diff --git a/include/extnsionst.h b/include/extnsionst.h index 6de9be309..b73b52519 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -1,51 +1,4 @@ -/* $Xorg: extnsionst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -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 +11,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 +22,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 +33,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 +68,40 @@ 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 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 */ |