svn merge ^/branches/released .

1 files changed, 112 insertions, 112 deletions

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 */

+