xserver git update 22/5/2010

3 files changed, 302 insertions, 302 deletions

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 7fe4407e3..254ddb3f4 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -300,7 +300,7 @@ extern _X_EXPORT Bool ValidAtom(
 extern _X_EXPORT const char *NameForAtom(

     Atom /*atom*/);

 

-extern _X_EXPORT void AtomError(void);

+extern _X_EXPORT void AtomError(void) _X_NORETURN;

 

 extern _X_EXPORT void FreeAllAtoms(void);

 

diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index 5b1a6981d..8f365f6ed 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -1,189 +1,189 @@
-/***********************************************************
-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.
-
-******************************************************************/
-
-#ifndef DIXSTRUCT_H
-#define DIXSTRUCT_H
-
-#include "dix.h"
-#include "resource.h"
-#include "cursor.h"
-#include "gc.h"
-#include "pixmap.h"
-#include "privates.h"
-#include <X11/Xmd.h>
-
-/*
- * 	direct-mapped hash table, used by resource manager to store
- *      translation from client ids to server addresses.
- */
-
-extern _X_EXPORT CallbackListPtr ClientStateCallback;
-
-typedef struct {
-    ClientPtr 		client;
-    xConnSetupPrefix 	*prefix; 
-    xConnSetup  	*setup;
-} NewClientInfoRec;
-
-typedef void (*ReplySwapPtr) (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-extern _X_EXPORT void ReplyNotSwappd (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-typedef enum {ClientStateInitial,
-	      ClientStateAuthenticating,
-	      ClientStateRunning,
-	      ClientStateRetained,
-	      ClientStateGone,
-	      ClientStateCheckingSecurity,
-	      ClientStateCheckedSecurity} ClientState;
-
-#ifdef XFIXES
-typedef struct _saveSet {
-    struct _Window  *windowPtr;
-    Bool	    toRoot;
-    Bool	    map;
-} SaveSetElt;
-#define SaveSetWindow(ss)   ((ss).windowPtr)
-#define SaveSetToRoot(ss)   ((ss).toRoot)
-#define SaveSetShouldMap(ss)	    ((ss).map)
-#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))
-#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
-#define SaveSetAssignMap(ss,m)      ((ss).map = (m))
-#else
-typedef struct _Window *SaveSetElt;
-#define SaveSetWindow(ss)   (ss)
-#define SaveSetToRoot(ss)   FALSE
-#define SaveSetShouldMap(ss)	    TRUE
-#define SaveSetAssignWindow(ss,w)   ((ss) = (w))
-#define SaveSetAssignToRoot(ss,tr)
-#define SaveSetAssignMap(ss,m)
-#endif
-
-typedef struct _Client {
-    int         index;
-    Mask        clientAsMask;
-    pointer     requestBuffer;
-    pointer     osPrivate;	/* for OS layer, including scheduler */
-    Bool        swapped;
-    ReplySwapPtr pSwapReplyFunc;
-    XID         errorValue;
-    int         sequence;
-    int         closeDownMode;
-    int         clientGone;
-    int         noClientException;	/* this client died or needs to be
-					 * killed */
-    SaveSetElt	*saveSet;
-    int         numSaved;
-    int         (**requestVector) (
-		ClientPtr /* pClient */);
-    CARD32	req_len;		/* length of current request */
-    Bool	big_requests;		/* supports large requests */
-    int		priority;
-    ClientState clientState;
-    PrivateRec	*devPrivates;
-    unsigned short	xkbClientFlags;
-    unsigned short	mapNotifyMask;
-    unsigned short	newKeyboardNotifyMask;
-    unsigned short	vMajor,vMinor;
-    KeyCode		minKC,maxKC;
-
-    unsigned long replyBytesRemaining;
-    int	    smart_priority;
-    long    smart_start_tick;
-    long    smart_stop_tick;
-    long    smart_check_tick;
-    
-    DeviceIntPtr clientPtr;
-}           ClientRec;
-
-/*
- * Scheduling interface
- */
-extern _X_EXPORT long SmartScheduleTime;
-extern _X_EXPORT long SmartScheduleInterval;
-extern _X_EXPORT long SmartScheduleSlice;
-extern _X_EXPORT long SmartScheduleMaxSlice;
-extern _X_EXPORT Bool SmartScheduleDisable;
-extern _X_EXPORT void SmartScheduleStartTimer(void);
-extern _X_EXPORT void SmartScheduleStopTimer(void);
-#define SMART_MAX_PRIORITY  (20)
-#define SMART_MIN_PRIORITY  (-20)
-
-extern _X_EXPORT Bool SmartScheduleInit(void);
-
-
-/* This prototype is used pervasively in Xext, dix */
-#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
-
-typedef struct _WorkQueue {
-    struct _WorkQueue *next;
-    Bool        (*function) (
-		ClientPtr	/* pClient */,
-		pointer		/* closure */
-);
-    ClientPtr   client;
-    pointer     closure;
-}           WorkQueueRec;
-
-extern _X_EXPORT TimeStamp currentTime;
-extern _X_EXPORT TimeStamp lastDeviceEventTime;
-
-extern _X_EXPORT int CompareTimeStamps(
-    TimeStamp /*a*/,
-    TimeStamp /*b*/);
-
-extern _X_EXPORT TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
-
-typedef struct _CallbackRec {
-  CallbackProcPtr proc;
-  pointer data;
-  Bool deleted;
-  struct _CallbackRec *next;
-} CallbackRec, *CallbackPtr;
-
-typedef struct _CallbackList {
-  int inCallback;
-  Bool deleted;
-  int numDeleted;
-  CallbackPtr list;
-} CallbackListRec;
-
-/* proc vectors */
-
-extern _X_EXPORT int (* InitialVector[3]) (ClientPtr /*client*/);
-
-extern _X_EXPORT int (* ProcVector[256]) (ClientPtr /*client*/);
-
-extern _X_EXPORT int (* SwappedProcVector[256]) (ClientPtr /*client*/);
-
-extern _X_EXPORT ReplySwapPtr ReplySwapVector[256];
-
-extern _X_EXPORT int ProcBadRequest(ClientPtr /*client*/);
-
-#endif				/* DIXSTRUCT_H */
+/***********************************************************

+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.

+

+******************************************************************/

+

+#ifndef DIXSTRUCT_H

+#define DIXSTRUCT_H

+

+#include "dix.h"

+#include "resource.h"

+#include "cursor.h"

+#include "gc.h"

+#include "pixmap.h"

+#include "privates.h"

+#include <X11/Xmd.h>

+

+/*

+ * 	direct-mapped hash table, used by resource manager to store

+ *      translation from client ids to server addresses.

+ */

+

+extern _X_EXPORT CallbackListPtr ClientStateCallback;

+

+typedef struct {

+    ClientPtr 		client;

+    xConnSetupPrefix 	*prefix; 

+    xConnSetup  	*setup;

+} NewClientInfoRec;

+

+typedef void (*ReplySwapPtr) (

+		ClientPtr	/* pClient */,

+		int		/* size */,

+		void *		/* pbuf */);

+

+extern _X_EXPORT void ReplyNotSwappd (

+		ClientPtr	/* pClient */,

+		int		/* size */,

+		void *		/* pbuf */) _X_NORETURN;

+

+typedef enum {ClientStateInitial,

+	      ClientStateAuthenticating,

+	      ClientStateRunning,

+	      ClientStateRetained,

+	      ClientStateGone,

+	      ClientStateCheckingSecurity,

+	      ClientStateCheckedSecurity} ClientState;

+

+#ifdef XFIXES

+typedef struct _saveSet {

+    struct _Window  *windowPtr;

+    Bool	    toRoot;

+    Bool	    map;

+} SaveSetElt;

+#define SaveSetWindow(ss)   ((ss).windowPtr)

+#define SaveSetToRoot(ss)   ((ss).toRoot)

+#define SaveSetShouldMap(ss)	    ((ss).map)

+#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))

+#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))

+#define SaveSetAssignMap(ss,m)      ((ss).map = (m))

+#else

+typedef struct _Window *SaveSetElt;

+#define SaveSetWindow(ss)   (ss)

+#define SaveSetToRoot(ss)   FALSE

+#define SaveSetShouldMap(ss)	    TRUE

+#define SaveSetAssignWindow(ss,w)   ((ss) = (w))

+#define SaveSetAssignToRoot(ss,tr)

+#define SaveSetAssignMap(ss,m)

+#endif

+

+typedef struct _Client {

+    int         index;

+    Mask        clientAsMask;

+    pointer     requestBuffer;

+    pointer     osPrivate;	/* for OS layer, including scheduler */

+    Bool        swapped;

+    ReplySwapPtr pSwapReplyFunc;

+    XID         errorValue;

+    int         sequence;

+    int         closeDownMode;

+    int         clientGone;

+    int         noClientException;	/* this client died or needs to be

+					 * killed */

+    SaveSetElt	*saveSet;

+    int         numSaved;

+    int         (**requestVector) (

+		ClientPtr /* pClient */);

+    CARD32	req_len;		/* length of current request */

+    Bool	big_requests;		/* supports large requests */

+    int		priority;

+    ClientState clientState;

+    PrivateRec	*devPrivates;

+    unsigned short	xkbClientFlags;

+    unsigned short	mapNotifyMask;

+    unsigned short	newKeyboardNotifyMask;

+    unsigned short	vMajor,vMinor;

+    KeyCode		minKC,maxKC;

+

+    unsigned long replyBytesRemaining;

+    int	    smart_priority;

+    long    smart_start_tick;

+    long    smart_stop_tick;

+    long    smart_check_tick;

+    

+    DeviceIntPtr clientPtr;

+}           ClientRec;

+

+/*

+ * Scheduling interface

+ */

+extern _X_EXPORT long SmartScheduleTime;

+extern _X_EXPORT long SmartScheduleInterval;

+extern _X_EXPORT long SmartScheduleSlice;

+extern _X_EXPORT long SmartScheduleMaxSlice;

+extern _X_EXPORT Bool SmartScheduleDisable;

+extern _X_EXPORT void SmartScheduleStartTimer(void);

+extern _X_EXPORT void SmartScheduleStopTimer(void);

+#define SMART_MAX_PRIORITY  (20)

+#define SMART_MIN_PRIORITY  (-20)

+

+extern _X_EXPORT Bool SmartScheduleInit(void);

+

+

+/* This prototype is used pervasively in Xext, dix */

+#define DISPATCH_PROC(func) int func(ClientPtr /* client */)

+

+typedef struct _WorkQueue {

+    struct _WorkQueue *next;

+    Bool        (*function) (

+		ClientPtr	/* pClient */,

+		pointer		/* closure */

+);

+    ClientPtr   client;

+    pointer     closure;

+}           WorkQueueRec;

+

+extern _X_EXPORT TimeStamp currentTime;

+extern _X_EXPORT TimeStamp lastDeviceEventTime;

+

+extern _X_EXPORT int CompareTimeStamps(

+    TimeStamp /*a*/,

+    TimeStamp /*b*/);

+

+extern _X_EXPORT TimeStamp ClientTimeToServerTime(CARD32 /*c*/);

+

+typedef struct _CallbackRec {

+  CallbackProcPtr proc;

+  pointer data;

+  Bool deleted;

+  struct _CallbackRec *next;

+} CallbackRec, *CallbackPtr;

+

+typedef struct _CallbackList {

+  int inCallback;

+  Bool deleted;

+  int numDeleted;

+  CallbackPtr list;

+} CallbackListRec;

+

+/* proc vectors */

+

+extern _X_EXPORT int (* InitialVector[3]) (ClientPtr /*client*/);

+

+extern _X_EXPORT int (* ProcVector[256]) (ClientPtr /*client*/);

+

+extern _X_EXPORT int (* SwappedProcVector[256]) (ClientPtr /*client*/);

+

+extern _X_EXPORT ReplySwapPtr ReplySwapVector[256];

+

+extern _X_EXPORT int ProcBadRequest(ClientPtr /*client*/);

+

+#endif				/* DIXSTRUCT_H */

diff --git a/xorg-server/include/extnsionst.h b/xorg-server/include/extnsionst.h
index 19c76fcc4..92790b38f 100644
--- a/xorg-server/include/extnsionst.h
+++ b/xorg-server/include/extnsionst.h
@@ -1,112 +1,112 @@
-/***********************************************************
-
-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.
-
-******************************************************************/
-
-#ifndef EXTENSIONSTRUCT_H
-#define EXTENSIONSTRUCT_H 
-
-#include "dix.h"
-#include "misc.h"
-#include "screenint.h"
-#include "extension.h"
-#include "gc.h"
-#include "privates.h"
-
-typedef struct _ExtensionEntry {
-    int index;
-    void (* CloseDown)(	/* called at server shutdown */
-	struct _ExtensionEntry * /* extension */);
-    char *name;               /* extension name */
-    int base;                 /* base request number */
-    int eventBase;            
-    int eventLast;
-    int errorBase;
-    int errorLast;
-    int num_aliases;
-    char **aliases;
-    pointer extPrivate;
-    unsigned short (* MinorOpcode)(	/* called for errors */
-	ClientPtr /* client */);
-    PrivateRec *devPrivates;
-} ExtensionEntry;
-
-/* 
- * The arguments may be different for extension event swapping functions.
- * Deal with this by casting when initializing the event's EventSwapVector[]
- * entries.
- */
-typedef void (*EventSwapPtr) (xEvent *, xEvent *);
-
-extern _X_EXPORT EventSwapPtr EventSwapVector[128];
-
-extern _X_EXPORT void NotImplemented (	/* FIXME: this may move to another file... */
-	xEvent *,
-	xEvent *);
-
-#define    SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom)    \
-    pGC->VectorElement = NewRoutineAddress;
-
-#define    GetGCValue(pGC, GCElement)    (pGC->GCElement)
-
-extern _X_EXPORT ExtensionEntry *AddExtension(
-    char* /*name*/,
-    int /*NumEvents*/,
-    int /*NumErrors*/,
-    int (* /*MainProc*/)(ClientPtr /*client*/),
-    int (* /*SwappedMainProc*/)(ClientPtr /*client*/),
-    void (* /*CloseDownProc*/)(ExtensionEntry * /*extension*/),
-    unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/)
-);
-
-extern _X_EXPORT Bool AddExtensionAlias(
-    char* /*alias*/,
-    ExtensionEntry * /*extension*/);
-
-extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname);
-extern _X_EXPORT ExtensionEntry *GetExtensionEntry(int major);
-
-#endif /* EXTENSIONSTRUCT_H */
-
+/***********************************************************

+

+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.

+

+******************************************************************/

+

+#ifndef EXTENSIONSTRUCT_H

+#define EXTENSIONSTRUCT_H 

+

+#include "dix.h"

+#include "misc.h"

+#include "screenint.h"

+#include "extension.h"

+#include "gc.h"

+#include "privates.h"

+

+typedef struct _ExtensionEntry {

+    int index;

+    void (* CloseDown)(	/* called at server shutdown */

+	struct _ExtensionEntry * /* extension */);

+    char *name;               /* extension name */

+    int base;                 /* base request number */

+    int eventBase;            

+    int eventLast;

+    int errorBase;

+    int errorLast;

+    int num_aliases;

+    char **aliases;

+    pointer extPrivate;

+    unsigned short (* MinorOpcode)(	/* called for errors */

+	ClientPtr /* client */);

+    PrivateRec *devPrivates;

+} ExtensionEntry;

+

+/* 

+ * The arguments may be different for extension event swapping functions.

+ * Deal with this by casting when initializing the event's EventSwapVector[]

+ * entries.

+ */

+typedef void (*EventSwapPtr) (xEvent *, xEvent *);

+

+extern _X_EXPORT EventSwapPtr EventSwapVector[128];

+

+extern _X_EXPORT void NotImplemented (	/* FIXME: this may move to another file... */

+	xEvent *,

+	xEvent *) _X_NORETURN;

+

+#define    SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom)    \

+    pGC->VectorElement = NewRoutineAddress;

+

+#define    GetGCValue(pGC, GCElement)    (pGC->GCElement)

+

+extern _X_EXPORT ExtensionEntry *AddExtension(

+    char* /*name*/,

+    int /*NumEvents*/,

+    int /*NumErrors*/,

+    int (* /*MainProc*/)(ClientPtr /*client*/),

+    int (* /*SwappedMainProc*/)(ClientPtr /*client*/),

+    void (* /*CloseDownProc*/)(ExtensionEntry * /*extension*/),

+    unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/)

+);

+

+extern _X_EXPORT Bool AddExtensionAlias(

+    char* /*alias*/,

+    ExtensionEntry * /*extension*/);

+

+extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname);

+extern _X_EXPORT ExtensionEntry *GetExtensionEntry(int major);

+

+#endif /* EXTENSIONSTRUCT_H */

+