Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

7 files changed, 809 insertions, 809 deletions

diff --git a/libXext/include/X11/extensions/XLbx.h b/libXext/include/X11/extensions/XLbx.h
index 94153343a..1af4f9ce2 100644
--- a/libXext/include/X11/extensions/XLbx.h
+++ b/libXext/include/X11/extensions/XLbx.h
@@ -1,50 +1,50 @@
-/*

- * Copyright 1992 Network Computing Devices

- *

- * 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, and that the name of NCD. not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  NCD. makes no representations about the

- * suitability of this software for any purpose.  It is provided "as is"

- * without express or implied warranty.

- *

- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.

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

-#define _XLBX_H_

-

-#include <X11/Xfuncproto.h>

-#include <X11/Xdefs.h>

-#include <X11/Xlib.h>

-#include <X11/extensions/lbx.h>

-

-_XFUNCPROTOBEGIN

-

-Bool XLbxQueryExtension(

-    Display*		/* dpy */,

-    int*		/* requestp */,

-    int*		/* event_basep */,

-    int*		/* error_basep */

-);

-

-Bool XLbxQueryVersion(

-    Display*		/* dpy */,

-    int*		/* majorVersion */,

-    int*		/* minorVersion */

-);

-

-int XLbxGetEventBase(Display *dpy);

-

-_XFUNCPROTOEND

-

-#endif

+/*
+ * Copyright 1992 Network Computing Devices
+ *
+ * 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, and that the name of NCD. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  NCD. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
+ * 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 _XLBX_H_
+#define _XLBX_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/Xdefs.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/lbx.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XLbxQueryExtension(
+    Display*		/* dpy */,
+    int*		/* requestp */,
+    int*		/* event_basep */,
+    int*		/* error_basep */
+);
+
+Bool XLbxQueryVersion(
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+);
+
+int XLbxGetEventBase(Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/libXext/include/X11/extensions/Xdbe.h b/libXext/include/X11/extensions/Xdbe.h
index 5ac72aa82..5c842a445 100644
--- a/libXext/include/X11/extensions/Xdbe.h
+++ b/libXext/include/X11/extensions/Xdbe.h
@@ -1,138 +1,138 @@
-/******************************************************************************

- * 

- * Copyright (c) 1994, 1995  Hewlett-Packard Company

- *

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sublicense, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard

- * Company 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 Hewlett-Packard Company.

- * 

- *     Header file for Xlib-related DBE

- *

- *****************************************************************************/

-

-#ifndef XDBE_H

-#define XDBE_H

-

-#include <X11/Xfuncproto.h>

-#include <X11/extensions/dbe.h>

-

-typedef struct

-{

-    VisualID    visual;    /* one visual ID that supports double-buffering */

-    int         depth;     /* depth of visual in bits                      */

-    int         perflevel; /* performance level of visual                  */

-}

-XdbeVisualInfo;

-

-typedef struct

-{

-    int                 count;          /* number of items in visual_depth   */

-    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */

-}

-XdbeScreenVisualInfo;

-

-

-typedef Drawable XdbeBackBuffer;

-

-typedef unsigned char XdbeSwapAction;

-

-typedef struct

-{

-    Window		swap_window;    /* window for which to swap buffers   */

-    XdbeSwapAction	swap_action;    /* swap action to use for swap_window */

-}

-XdbeSwapInfo;

-

-typedef struct

-{

-    Window	window;			/* window that buffer belongs to */

-}

-XdbeBackBufferAttributes;

-

-typedef struct

-{

-    int			type;

-    Display		*display;	/* display the event was read from */

-    XdbeBackBuffer	buffer;		/* resource id                     */

-    unsigned long	serial;		/* serial number of failed request */

-    unsigned char	error_code;	/* error base + XdbeBadBuffer      */

-    unsigned char	request_code;	/* major opcode of failed request  */

-    unsigned char	minor_code;	/* minor opcode of failed request  */

-}

-XdbeBufferError;

-

-/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops

- * (for non-C++ builds) in X11/Xfuncproto.h.

- */

-_XFUNCPROTOBEGIN

-

-extern Status XdbeQueryExtension(

-    Display*		/* dpy                  */,

-    int*		/* major_version_return */,

-    int*		/* minor_version_return */

-);

-

-extern XdbeBackBuffer XdbeAllocateBackBufferName(

-    Display*		/* dpy         */,

-    Window		/* window      */,

-    XdbeSwapAction	/* swap_action */

-);

-

-extern Status XdbeDeallocateBackBufferName(

-    Display*		/* dpy    */,

-    XdbeBackBuffer	/* buffer */

-);

-

-extern Status XdbeSwapBuffers(

-    Display*		/* dpy         */,

-    XdbeSwapInfo*	/* swap_info   */,

-    int			/* num_windows */

-);

-

-extern Status XdbeBeginIdiom(

-    Display*		/* dpy */

-);

-

-extern Status XdbeEndIdiom(

-    Display*		/* dpy */

-);

-

-extern XdbeScreenVisualInfo *XdbeGetVisualInfo(

-    Display*		/* dpy               */,

-    Drawable*		/* screen_specifiers */,

-    int*		/* num_screens       */

-);

-

-extern void XdbeFreeVisualInfo(

-    XdbeScreenVisualInfo*	/* visual_info */

-);

-

-extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(

-    Display*		/* dpy    */,

-    XdbeBackBuffer	/* buffer */

-);

-

-_XFUNCPROTOEND

-

-#endif /* XDBE_H */

-

+/******************************************************************************
+ *
+ * Copyright (c) 1994, 1995  Hewlett-Packard Company
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+ * Company 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 Hewlett-Packard Company.
+ *
+ *     Header file for Xlib-related DBE
+ *
+ *****************************************************************************/
+
+#ifndef XDBE_H
+#define XDBE_H
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/dbe.h>
+
+typedef struct
+{
+    VisualID    visual;    /* one visual ID that supports double-buffering */
+    int         depth;     /* depth of visual in bits                      */
+    int         perflevel; /* performance level of visual                  */
+}
+XdbeVisualInfo;
+
+typedef struct
+{
+    int                 count;          /* number of items in visual_depth   */
+    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */
+}
+XdbeScreenVisualInfo;
+
+
+typedef Drawable XdbeBackBuffer;
+
+typedef unsigned char XdbeSwapAction;
+
+typedef struct
+{
+    Window		swap_window;    /* window for which to swap buffers   */
+    XdbeSwapAction	swap_action;    /* swap action to use for swap_window */
+}
+XdbeSwapInfo;
+
+typedef struct
+{
+    Window	window;			/* window that buffer belongs to */
+}
+XdbeBackBufferAttributes;
+
+typedef struct
+{
+    int			type;
+    Display		*display;	/* display the event was read from */
+    XdbeBackBuffer	buffer;		/* resource id                     */
+    unsigned long	serial;		/* serial number of failed request */
+    unsigned char	error_code;	/* error base + XdbeBadBuffer      */
+    unsigned char	request_code;	/* major opcode of failed request  */
+    unsigned char	minor_code;	/* minor opcode of failed request  */
+}
+XdbeBufferError;
+
+/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops
+ * (for non-C++ builds) in X11/Xfuncproto.h.
+ */
+_XFUNCPROTOBEGIN
+
+extern Status XdbeQueryExtension(
+    Display*		/* dpy                  */,
+    int*		/* major_version_return */,
+    int*		/* minor_version_return */
+);
+
+extern XdbeBackBuffer XdbeAllocateBackBufferName(
+    Display*		/* dpy         */,
+    Window		/* window      */,
+    XdbeSwapAction	/* swap_action */
+);
+
+extern Status XdbeDeallocateBackBufferName(
+    Display*		/* dpy    */,
+    XdbeBackBuffer	/* buffer */
+);
+
+extern Status XdbeSwapBuffers(
+    Display*		/* dpy         */,
+    XdbeSwapInfo*	/* swap_info   */,
+    int			/* num_windows */
+);
+
+extern Status XdbeBeginIdiom(
+    Display*		/* dpy */
+);
+
+extern Status XdbeEndIdiom(
+    Display*		/* dpy */
+);
+
+extern XdbeScreenVisualInfo *XdbeGetVisualInfo(
+    Display*		/* dpy               */,
+    Drawable*		/* screen_specifiers */,
+    int*		/* num_screens       */
+);
+
+extern void XdbeFreeVisualInfo(
+    XdbeScreenVisualInfo*	/* visual_info */
+);
+
+extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
+    Display*		/* dpy    */,
+    XdbeBackBuffer	/* buffer */
+);
+
+_XFUNCPROTOEND
+
+#endif /* XDBE_H */
+
diff --git a/libXext/include/X11/extensions/Xge.h b/libXext/include/X11/extensions/Xge.h
index 51382ffd0..76b5a6a01 100644
--- a/libXext/include/X11/extensions/Xge.h
+++ b/libXext/include/X11/extensions/Xge.h
@@ -36,7 +36,7 @@
 _XFUNCPROTOBEGIN
 
 /**
- * Generic Event mask. 
+ * Generic Event mask.
  * To be used whenever a list of masks per extension has to be provided.
  *
  * But, don't actually use the CARD{8,16,32} types.  We can't get them them
diff --git a/libXext/include/X11/extensions/dpms.h b/libXext/include/X11/extensions/dpms.h
index b57007bda..f85e6a725 100644
--- a/libXext/include/X11/extensions/dpms.h
+++ b/libXext/include/X11/extensions/dpms.h
@@ -1,53 +1,53 @@
-/*****************************************************************

-

-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software.

-

-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

-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, 

-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation 

-shall not be used in advertising or otherwise to promote the sale, use or other

-dealings in this Software without prior written authorization from Digital 

-Equipment Corporation.

-

-******************************************************************/

-

-#ifndef _X11_EXTENSIONS_DPMS_H

-#define _X11_EXTENSIONS_DPMS_H 1

-

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include <X11/extensions/dpmsconst.h>

-

-#ifndef DPMS_SERVER

-_XFUNCPROTOBEGIN

-

-extern Bool DPMSQueryExtension(Display *, int *, int *);

-extern Status DPMSGetVersion(Display *, int *, int *);

-extern Bool DPMSCapable(Display *);

-extern Status DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16);

-extern Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *);

-extern Status DPMSEnable(Display *);

-extern Status DPMSDisable(Display *);

-extern Status DPMSForceLevel(Display *, CARD16);

-extern Status DPMSInfo(Display *, CARD16 *, BOOL *);

-

-_XFUNCPROTOEND

-#endif

-

-#endif /* !_X11_EXTENSIONS_DPMS_H */

-

+/*****************************************************************
+
+Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+#ifndef _X11_EXTENSIONS_DPMS_H
+#define _X11_EXTENSIONS_DPMS_H 1
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/dpmsconst.h>
+
+#ifndef DPMS_SERVER
+_XFUNCPROTOBEGIN
+
+extern Bool DPMSQueryExtension(Display *, int *, int *);
+extern Status DPMSGetVersion(Display *, int *, int *);
+extern Bool DPMSCapable(Display *);
+extern Status DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16);
+extern Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *);
+extern Status DPMSEnable(Display *);
+extern Status DPMSDisable(Display *);
+extern Status DPMSForceLevel(Display *, CARD16);
+extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
+
+_XFUNCPROTOEND
+#endif
+
+#endif /* !_X11_EXTENSIONS_DPMS_H */
+
diff --git a/libXext/include/X11/extensions/extutil.h b/libXext/include/X11/extensions/extutil.h
index dd05a6580..7f05affd8 100644
--- a/libXext/include/X11/extensions/extutil.h
+++ b/libXext/include/X11/extensions/extutil.h
@@ -1,190 +1,190 @@
-/*

- *

-Copyright 1989, 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.

- *

- * Author:  Jim Fulton, MIT The Open Group

- * 

- *                     Xlib Extension-Writing Utilities

- *

- * This package contains utilities for writing the client API for various

- * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND

- * ARE SUBJECT TO CHANGE!

- */

-

-#ifndef _EXTUTIL_H_

-#define _EXTUTIL_H_

-

-#include <X11/extensions/Xext.h>

-

-/*

- * We need to keep a list of open displays since the Xlib display list isn't

- * public.  We also have to per-display info in a separate block since it isn't

- * stored directly in the Display structure.

- */

-typedef struct _XExtDisplayInfo {

-    struct _XExtDisplayInfo *next;	/* keep a linked list */

-    Display *display;			/* which display this is */

-    XExtCodes *codes;			/* the extension protocol codes */

-    XPointer data;			/* extra data for extension to use */

-} XExtDisplayInfo;

-

-typedef struct _XExtensionInfo {

-    XExtDisplayInfo *head;		/* start of list */

-    XExtDisplayInfo *cur;		/* most recently used */

-    int ndisplays;			/* number of displays */

-} XExtensionInfo;

-

-typedef struct _XExtensionHooks {

-    int (*create_gc)(

-	      Display*			/* display */,

-	      GC			/* gc */,

-	      XExtCodes*		/* codes */

-);

-    int (*copy_gc)(

-	      Display*			/* display */,

-              GC			/* gc */,

-              XExtCodes*		/* codes */

-);

-    int (*flush_gc)(

-	      Display*			/* display */,

-              GC			/* gc */,

-              XExtCodes*		/* codes */

-);

-    int (*free_gc)(

-	      Display*			/* display */,

-              GC			/* gc */,

-              XExtCodes*		/* codes */

-);

-    int (*create_font)(

-	      Display*			/* display */,

-              XFontStruct*		/* fs */,

-              XExtCodes*		/* codes */

-);

-    int (*free_font)(

-	      Display*			/* display */,

-              XFontStruct*		/* fs */,

-              XExtCodes*		/* codes */

-);

-    int (*close_display)(

-	      Display*			/* display */,

-              XExtCodes*		/* codes */

-);

-    Bool (*wire_to_event)(

-	       Display*			/* display */,

-               XEvent*			/* re */,

-               xEvent*			/* event */

-);

-    Status (*event_to_wire)(

-	      Display*			/* display */,

-              XEvent*			/* re */,

-              xEvent*			/* event */

-);

-    int (*error)(

-	      Display*			/* display */,

-              xError*			/* err */,

-              XExtCodes*		/* codes */,

-              int*			/* ret_code */

-);

-    char *(*error_string)(

-	        Display*		/* display */,

-                int			/* code */,

-                XExtCodes*		/* codes */,

-                char*			/* buffer */,

-                int			/* nbytes */

-);

-} XExtensionHooks;

-

-extern XExtensionInfo *XextCreateExtension(

-    void

-);

-extern void XextDestroyExtension(

-    XExtensionInfo*	/* info */

-);

-extern XExtDisplayInfo *XextAddDisplay(

-    XExtensionInfo*	/* extinfo */,

-    Display*		/* dpy */,

-    char*		/* ext_name */,

-    XExtensionHooks*	/* hooks */,

-    int			/* nevents */,

-    XPointer		/* data */

-);

-extern int XextRemoveDisplay(

-    XExtensionInfo*	/* extinfo */,

-    Display*		/* dpy */

-);

-extern XExtDisplayInfo *XextFindDisplay(

-    XExtensionInfo*	/* extinfo */,

-    Display*		/* dpy */

-);

-

-#define XextHasExtension(i) ((i) && ((i)->codes))

-#define XextCheckExtension(dpy,i,name,val) \

-  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }

-#define XextSimpleCheckExtension(dpy,i,name) \

-  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }

-

-

-/*

- * helper macros to generate code that is common to all extensions; caller

- * should prefix it with static if extension source is in one file; this

- * could be a utility function, but have to stack 6 unused arguments for 

- * something that is called many, many times would be bad.

- */

-#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \

-XExtDisplayInfo *proc (Display *dpy) \

-{ \

-    XExtDisplayInfo *dpyinfo; \

-    if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \

-    if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \

-      dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \

-    return dpyinfo; \

-}

-

-#define XEXT_FIND_DISPLAY_PROTO(proc) \

-	XExtDisplayInfo *proc(Display *dpy)

-

-#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \

-int proc (Display *dpy, XExtCodes *codes) \

-{ \

-    return XextRemoveDisplay (extinfo, dpy); \

-}

-

-#define XEXT_CLOSE_DISPLAY_PROTO(proc) \

-	int proc(Display *dpy, XExtCodes *codes)

-

-#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \

-char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \

-{  \

-    code -= codes->first_error;  \

-    if (code >= 0 && code < nerr) { \

-	char tmp[256]; \

-	sprintf (tmp, "%s.%d", extname, code); \

-	XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \

-	return buf; \

-    } \

-    return (char *)0; \

-}

-

-#define XEXT_ERROR_STRING_PROTO(proc) \

-	char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)

-#endif

+/*
+ *
+Copyright 1989, 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.
+ *
+ * Author:  Jim Fulton, MIT The Open Group
+ *
+ *                     Xlib Extension-Writing Utilities
+ *
+ * This package contains utilities for writing the client API for various
+ * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
+ * ARE SUBJECT TO CHANGE!
+ */
+
+#ifndef _EXTUTIL_H_
+#define _EXTUTIL_H_
+
+#include <X11/extensions/Xext.h>
+
+/*
+ * We need to keep a list of open displays since the Xlib display list isn't
+ * public.  We also have to per-display info in a separate block since it isn't
+ * stored directly in the Display structure.
+ */
+typedef struct _XExtDisplayInfo {
+    struct _XExtDisplayInfo *next;	/* keep a linked list */
+    Display *display;			/* which display this is */
+    XExtCodes *codes;			/* the extension protocol codes */
+    XPointer data;			/* extra data for extension to use */
+} XExtDisplayInfo;
+
+typedef struct _XExtensionInfo {
+    XExtDisplayInfo *head;		/* start of list */
+    XExtDisplayInfo *cur;		/* most recently used */
+    int ndisplays;			/* number of displays */
+} XExtensionInfo;
+
+typedef struct _XExtensionHooks {
+    int (*create_gc)(
+	      Display*			/* display */,
+	      GC			/* gc */,
+	      XExtCodes*		/* codes */
+);
+    int (*copy_gc)(
+	      Display*			/* display */,
+              GC			/* gc */,
+              XExtCodes*		/* codes */
+);
+    int (*flush_gc)(
+	      Display*			/* display */,
+              GC			/* gc */,
+              XExtCodes*		/* codes */
+);
+    int (*free_gc)(
+	      Display*			/* display */,
+              GC			/* gc */,
+              XExtCodes*		/* codes */
+);
+    int (*create_font)(
+	      Display*			/* display */,
+              XFontStruct*		/* fs */,
+              XExtCodes*		/* codes */
+);
+    int (*free_font)(
+	      Display*			/* display */,
+              XFontStruct*		/* fs */,
+              XExtCodes*		/* codes */
+);
+    int (*close_display)(
+	      Display*			/* display */,
+              XExtCodes*		/* codes */
+);
+    Bool (*wire_to_event)(
+	       Display*			/* display */,
+               XEvent*			/* re */,
+               xEvent*			/* event */
+);
+    Status (*event_to_wire)(
+	      Display*			/* display */,
+              XEvent*			/* re */,
+              xEvent*			/* event */
+);
+    int (*error)(
+	      Display*			/* display */,
+              xError*			/* err */,
+              XExtCodes*		/* codes */,
+              int*			/* ret_code */
+);
+    char *(*error_string)(
+	        Display*		/* display */,
+                int			/* code */,
+                XExtCodes*		/* codes */,
+                char*			/* buffer */,
+                int			/* nbytes */
+);
+} XExtensionHooks;
+
+extern XExtensionInfo *XextCreateExtension(
+    void
+);
+extern void XextDestroyExtension(
+    XExtensionInfo*	/* info */
+);
+extern XExtDisplayInfo *XextAddDisplay(
+    XExtensionInfo*	/* extinfo */,
+    Display*		/* dpy */,
+    char*		/* ext_name */,
+    XExtensionHooks*	/* hooks */,
+    int			/* nevents */,
+    XPointer		/* data */
+);
+extern int XextRemoveDisplay(
+    XExtensionInfo*	/* extinfo */,
+    Display*		/* dpy */
+);
+extern XExtDisplayInfo *XextFindDisplay(
+    XExtensionInfo*	/* extinfo */,
+    Display*		/* dpy */
+);
+
+#define XextHasExtension(i) ((i) && ((i)->codes))
+#define XextCheckExtension(dpy,i,name,val) \
+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }
+#define XextSimpleCheckExtension(dpy,i,name) \
+  if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }
+
+
+/*
+ * helper macros to generate code that is common to all extensions; caller
+ * should prefix it with static if extension source is in one file; this
+ * could be a utility function, but have to stack 6 unused arguments for
+ * something that is called many, many times would be bad.
+ */
+#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
+XExtDisplayInfo *proc (Display *dpy) \
+{ \
+    XExtDisplayInfo *dpyinfo; \
+    if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
+    if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \
+      dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
+    return dpyinfo; \
+}
+
+#define XEXT_FIND_DISPLAY_PROTO(proc) \
+	XExtDisplayInfo *proc(Display *dpy)
+
+#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
+int proc (Display *dpy, XExtCodes *codes) \
+{ \
+    return XextRemoveDisplay (extinfo, dpy); \
+}
+
+#define XEXT_CLOSE_DISPLAY_PROTO(proc) \
+	int proc(Display *dpy, XExtCodes *codes)
+
+#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \
+char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
+{  \
+    code -= codes->first_error;  \
+    if (code >= 0 && code < nerr) { \
+	char tmp[256]; \
+	sprintf (tmp, "%s.%d", extname, code); \
+	XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
+	return buf; \
+    } \
+    return (char *)0; \
+}
+
+#define XEXT_ERROR_STRING_PROTO(proc) \
+	char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
+#endif
diff --git a/libXext/include/X11/extensions/sync.h b/libXext/include/X11/extensions/sync.h
index 0ed5b728d..d3a239f66 100644
--- a/libXext/include/X11/extensions/sync.h
+++ b/libXext/include/X11/extensions/sync.h
@@ -1,375 +1,375 @@
-/*

-

-Copyright 1991, 1993, 1994, 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 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

-and Olivetti Research Limited, Cambridge, England.

-

-                        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 names of Digital or Olivetti

-not be used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

-FITNESS, IN NO EVENT SHALL THEY 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 _SYNC_H_

-#define _SYNC_H_

-

-#include <X11/Xfuncproto.h>

-#include <X11/extensions/syncconst.h>

-

-#ifdef _SYNC_SERVER

-#include <X11/extensions/syncproto.h>

-#else

-

-_XFUNCPROTOBEGIN

-/* get rid of macros so we can define corresponding functions */

-#undef XSyncIntToValue

-#undef XSyncIntsToValue

-#undef XSyncValueGreaterThan

-#undef XSyncValueLessThan

-#undef XSyncValueGreaterOrEqual

-#undef XSyncValueLessOrEqual

-#undef XSyncValueEqual

-#undef XSyncValueIsNegative

-#undef XSyncValueIsZero

-#undef XSyncValueIsPositive

-#undef XSyncValueLow32

-#undef XSyncValueHigh32

-#undef XSyncValueAdd

-#undef XSyncValueSubtract

-#undef XSyncMaxValue

-#undef XSyncMinValue

-

-extern void XSyncIntToValue(

-    XSyncValue* /*pv*/,

-    int /*i*/

-);

-

-extern void XSyncIntsToValue(

-    XSyncValue* /*pv*/,

-    unsigned int /*l*/,

-    int /*h*/

-);

-

-extern Bool XSyncValueGreaterThan(

-    XSyncValue /*a*/,

-    XSyncValue /*b*/

-);

-

-extern Bool XSyncValueLessThan(

-    XSyncValue /*a*/,

-    XSyncValue /*b*/

-);

-

-extern Bool XSyncValueGreaterOrEqual(

-    XSyncValue /*a*/,

-    XSyncValue /*b*/

-);

-

-extern Bool XSyncValueLessOrEqual(

-    XSyncValue /*a*/,

-    XSyncValue /*b*/

-);

-

-extern Bool XSyncValueEqual(

-    XSyncValue /*a*/,

-    XSyncValue /*b*/

-);

-

-extern Bool XSyncValueIsNegative(

-    XSyncValue /*v*/

-);

-

-extern Bool XSyncValueIsZero(

-    XSyncValue /*a*/

-);

-

-extern Bool XSyncValueIsPositive(

-    XSyncValue /*v*/

-);

-

-extern unsigned int XSyncValueLow32(

-    XSyncValue /*v*/

-);

-

-extern int XSyncValueHigh32(

-    XSyncValue /*v*/

-);

-

-extern void XSyncValueAdd(

-    XSyncValue* /*presult*/,

-    XSyncValue /*a*/,

-    XSyncValue /*b*/,

-    int* /*poverflow*/

-);

-

-extern void XSyncValueSubtract(

-    XSyncValue* /*presult*/,

-    XSyncValue /*a*/,

-    XSyncValue /*b*/,

-    int* /*poverflow*/

-);

-

-extern void XSyncMaxValue(

-    XSyncValue* /*pv*/

-);

-

-extern void XSyncMinValue(

-    XSyncValue* /*pv*/

-);

-

-_XFUNCPROTOEND

-

-

-typedef struct _XSyncSystemCounter {

-    char *name;			/* null-terminated name of system counter */

-    XSyncCounter counter;	/* counter id of this system counter */

-    XSyncValue resolution;	/* resolution of this system counter */

-} XSyncSystemCounter;

-

-

-typedef struct {

-    XSyncCounter counter;	/* counter to trigger on */

-    XSyncValueType value_type;	/* absolute/relative */

-    XSyncValue wait_value;	/* value to compare counter to */

-    XSyncTestType test_type;	/* pos/neg comparison/transtion */

-} XSyncTrigger;

-

-typedef struct {

-    XSyncTrigger trigger;	/* trigger for await */

-    XSyncValue event_threshold; /* send event if past threshold */

-} XSyncWaitCondition;

-

-

-typedef struct {

-    XSyncTrigger trigger;

-    XSyncValue  delta;

-    Bool events;

-    XSyncAlarmState state;

-} XSyncAlarmAttributes;

-

-/*

- *  Events

- */

-

-typedef struct {

-    int type;			/* event base + XSyncCounterNotify */

-    unsigned long serial;	/* # of last request processed by server */

-    Bool send_event;		/* true if this came from a SendEvent request */

-    Display *display;		/* Display the event was read from */

-    XSyncCounter counter;	/* counter involved in await */

-    XSyncValue wait_value;	/* value being waited for */

-    XSyncValue counter_value;	/* counter value when this event was sent */

-    Time time;			/* milliseconds */

-    int count;			/* how many more events to come */

-    Bool destroyed;		/* True if counter was destroyed */

-} XSyncCounterNotifyEvent;

-

-typedef struct {

-    int type;			/* event base + XSyncCounterNotify */

-    unsigned long serial;	/* # of last request processed by server */

-    Bool send_event;		/* true if this came from a SendEvent request */

-    Display *display;		/* Display the event was read from */

-    XSyncAlarm alarm;		/* alarm that triggered */

-    XSyncValue counter_value;	/* value that triggered the alarm */

-    XSyncValue alarm_value;	/* test  value of trigger in alarm */

-    Time time;			/* milliseconds */

-    XSyncAlarmState state;	/* new state of alarm */

-} XSyncAlarmNotifyEvent;

-

-/*

- *  Errors 

- */

-

-typedef struct {

-    int type;			

-    Display *display;		/* Display the event was read from */

-    XSyncAlarm alarm;		/* resource id */

-    unsigned long serial;	/* serial number of failed request */

-    unsigned char error_code;	/* error base + XSyncBadAlarm */

-    unsigned char request_code;	/* Major op-code of failed request */

-    unsigned char minor_code;	/* Minor op-code of failed request */

-} XSyncAlarmError;

-

-typedef struct {

-    int type;			

-    Display *display;		/* Display the event was read from */

-    XSyncCounter counter;	/* resource id */

-    unsigned long serial;	/* serial number of failed request */

-    unsigned char error_code;	/* error base + XSyncBadCounter */

-    unsigned char request_code;	/* Major op-code of failed request */

-    unsigned char minor_code;	/* Minor op-code of failed request */

-} XSyncCounterError;

-

-/* 

- *  Prototypes

- */

-

-_XFUNCPROTOBEGIN

-

-extern Status XSyncQueryExtension(

-    Display* /*dpy*/,

-    int* /*event_base_return*/,

-    int* /*error_base_return*/

-);

-

-extern Status XSyncInitialize(

-    Display* /*dpy*/,

-    int* /*major_version_return*/,

-    int* /*minor_version_return*/

-);

-

-extern XSyncSystemCounter *XSyncListSystemCounters(

-    Display* /*dpy*/,

-    int* /*n_counters_return*/

-);

-

-extern void XSyncFreeSystemCounterList(

-    XSyncSystemCounter* /*list*/

-);

-

-extern XSyncCounter XSyncCreateCounter(

-    Display* /*dpy*/,

-    XSyncValue /*initial_value*/

-);

-

-extern Status XSyncSetCounter(

-    Display* /*dpy*/,

-    XSyncCounter /*counter*/,

-    XSyncValue /*value*/

-);

-

-extern Status XSyncChangeCounter(

-    Display* /*dpy*/,

-    XSyncCounter /*counter*/,

-    XSyncValue /*value*/

-);

-

-extern Status XSyncDestroyCounter(

-    Display* /*dpy*/,

-    XSyncCounter /*counter*/

-);

-

-extern Status XSyncQueryCounter(

-    Display* /*dpy*/,

-    XSyncCounter /*counter*/,

-    XSyncValue* /*value_return*/

-);

-

-extern Status XSyncAwait(

-    Display* /*dpy*/,

-    XSyncWaitCondition* /*wait_list*/,

-    int /*n_conditions*/

-);

-

-extern XSyncAlarm XSyncCreateAlarm(

-    Display* /*dpy*/,

-    unsigned long /*values_mask*/,

-    XSyncAlarmAttributes* /*values*/

-);

-

-extern Status XSyncDestroyAlarm(

-    Display* /*dpy*/,

-    XSyncAlarm /*alarm*/

-);

-

-extern Status XSyncQueryAlarm(

-    Display* /*dpy*/,

-    XSyncAlarm /*alarm*/,

-    XSyncAlarmAttributes* /*values_return*/

-);

-

-extern Status XSyncChangeAlarm(

-    Display* /*dpy*/,

-    XSyncAlarm /*alarm*/,

-    unsigned long /*values_mask*/,

-    XSyncAlarmAttributes* /*values*/

-);

-

-extern Status XSyncSetPriority(

-    Display* /*dpy*/,

-    XID /*client_resource_id*/,

-    int /*priority*/

-);

-

-extern Status XSyncGetPriority(

-    Display* /*dpy*/,

-    XID /*client_resource_id*/,

-    int* /*return_priority*/

-);

-

-extern XSyncFence XSyncCreateFence(

-    Display* /*dpy*/,

-    Drawable /*d*/,

-    Bool /*initially_triggered*/

-);

-

-extern Bool XSyncTriggerFence(

-    Display* /*dpy*/,

-    XSyncFence /*fence*/

-);

-

-extern Bool XSyncResetFence(

-    Display* /*dpy*/,

-    XSyncFence /*fence*/

-);

-

-extern Bool XSyncDestroyFence(

-    Display* /*dpy*/,

-    XSyncFence /*fence*/

-);

-

-extern Bool XSyncQueryFence(

-    Display* /*dpy*/,

-    XSyncFence /*fence*/,

-    Bool* /*triggered*/

-);

-

-extern Bool XSyncAwaitFence(

-    Display* /*dpy*/,

-    const XSyncFence* /*fence_list*/,

-    int /*n_fences*/

-);

-

-_XFUNCPROTOEND

-

-#endif /* _SYNC_SERVER */

-

-#endif /* _SYNC_H_ */

+/*
+
+Copyright 1991, 1993, 1994, 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 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+                        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 names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY 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 _SYNC_H_
+#define _SYNC_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/syncconst.h>
+
+#ifdef _SYNC_SERVER
+#include <X11/extensions/syncproto.h>
+#else
+
+_XFUNCPROTOBEGIN
+/* get rid of macros so we can define corresponding functions */
+#undef XSyncIntToValue
+#undef XSyncIntsToValue
+#undef XSyncValueGreaterThan
+#undef XSyncValueLessThan
+#undef XSyncValueGreaterOrEqual
+#undef XSyncValueLessOrEqual
+#undef XSyncValueEqual
+#undef XSyncValueIsNegative
+#undef XSyncValueIsZero
+#undef XSyncValueIsPositive
+#undef XSyncValueLow32
+#undef XSyncValueHigh32
+#undef XSyncValueAdd
+#undef XSyncValueSubtract
+#undef XSyncMaxValue
+#undef XSyncMinValue
+
+extern void XSyncIntToValue(
+    XSyncValue* /*pv*/,
+    int /*i*/
+);
+
+extern void XSyncIntsToValue(
+    XSyncValue* /*pv*/,
+    unsigned int /*l*/,
+    int /*h*/
+);
+
+extern Bool XSyncValueGreaterThan(
+    XSyncValue /*a*/,
+    XSyncValue /*b*/
+);
+
+extern Bool XSyncValueLessThan(
+    XSyncValue /*a*/,
+    XSyncValue /*b*/
+);
+
+extern Bool XSyncValueGreaterOrEqual(
+    XSyncValue /*a*/,
+    XSyncValue /*b*/
+);
+
+extern Bool XSyncValueLessOrEqual(
+    XSyncValue /*a*/,
+    XSyncValue /*b*/
+);
+
+extern Bool XSyncValueEqual(
+    XSyncValue /*a*/,
+    XSyncValue /*b*/
+);
+
+extern Bool XSyncValueIsNegative(
+    XSyncValue /*v*/
+);
+
+extern Bool XSyncValueIsZero(
+    XSyncValue /*a*/
+);
+
+extern Bool XSyncValueIsPositive(
+    XSyncValue /*v*/
+);
+
+extern unsigned int XSyncValueLow32(
+    XSyncValue /*v*/
+);
+
+extern int XSyncValueHigh32(
+    XSyncValue /*v*/
+);
+
+extern void XSyncValueAdd(
+    XSyncValue* /*presult*/,
+    XSyncValue /*a*/,
+    XSyncValue /*b*/,
+    int* /*poverflow*/
+);
+
+extern void XSyncValueSubtract(
+    XSyncValue* /*presult*/,
+    XSyncValue /*a*/,
+    XSyncValue /*b*/,
+    int* /*poverflow*/
+);
+
+extern void XSyncMaxValue(
+    XSyncValue* /*pv*/
+);
+
+extern void XSyncMinValue(
+    XSyncValue* /*pv*/
+);
+
+_XFUNCPROTOEND
+
+
+typedef struct _XSyncSystemCounter {
+    char *name;			/* null-terminated name of system counter */
+    XSyncCounter counter;	/* counter id of this system counter */
+    XSyncValue resolution;	/* resolution of this system counter */
+} XSyncSystemCounter;
+
+
+typedef struct {
+    XSyncCounter counter;	/* counter to trigger on */
+    XSyncValueType value_type;	/* absolute/relative */
+    XSyncValue wait_value;	/* value to compare counter to */
+    XSyncTestType test_type;	/* pos/neg comparison/transtion */
+} XSyncTrigger;
+
+typedef struct {
+    XSyncTrigger trigger;	/* trigger for await */
+    XSyncValue event_threshold; /* send event if past threshold */
+} XSyncWaitCondition;
+
+
+typedef struct {
+    XSyncTrigger trigger;
+    XSyncValue  delta;
+    Bool events;
+    XSyncAlarmState state;
+} XSyncAlarmAttributes;
+
+/*
+ *  Events
+ */
+
+typedef struct {
+    int type;			/* event base + XSyncCounterNotify */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came from a SendEvent request */
+    Display *display;		/* Display the event was read from */
+    XSyncCounter counter;	/* counter involved in await */
+    XSyncValue wait_value;	/* value being waited for */
+    XSyncValue counter_value;	/* counter value when this event was sent */
+    Time time;			/* milliseconds */
+    int count;			/* how many more events to come */
+    Bool destroyed;		/* True if counter was destroyed */
+} XSyncCounterNotifyEvent;
+
+typedef struct {
+    int type;			/* event base + XSyncCounterNotify */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came from a SendEvent request */
+    Display *display;		/* Display the event was read from */
+    XSyncAlarm alarm;		/* alarm that triggered */
+    XSyncValue counter_value;	/* value that triggered the alarm */
+    XSyncValue alarm_value;	/* test  value of trigger in alarm */
+    Time time;			/* milliseconds */
+    XSyncAlarmState state;	/* new state of alarm */
+} XSyncAlarmNotifyEvent;
+
+/*
+ *  Errors
+ */
+
+typedef struct {
+    int type;
+    Display *display;		/* Display the event was read from */
+    XSyncAlarm alarm;		/* resource id */
+    unsigned long serial;	/* serial number of failed request */
+    unsigned char error_code;	/* error base + XSyncBadAlarm */
+    unsigned char request_code;	/* Major op-code of failed request */
+    unsigned char minor_code;	/* Minor op-code of failed request */
+} XSyncAlarmError;
+
+typedef struct {
+    int type;
+    Display *display;		/* Display the event was read from */
+    XSyncCounter counter;	/* resource id */
+    unsigned long serial;	/* serial number of failed request */
+    unsigned char error_code;	/* error base + XSyncBadCounter */
+    unsigned char request_code;	/* Major op-code of failed request */
+    unsigned char minor_code;	/* Minor op-code of failed request */
+} XSyncCounterError;
+
+/*
+ *  Prototypes
+ */
+
+_XFUNCPROTOBEGIN
+
+extern Status XSyncQueryExtension(
+    Display* /*dpy*/,
+    int* /*event_base_return*/,
+    int* /*error_base_return*/
+);
+
+extern Status XSyncInitialize(
+    Display* /*dpy*/,
+    int* /*major_version_return*/,
+    int* /*minor_version_return*/
+);
+
+extern XSyncSystemCounter *XSyncListSystemCounters(
+    Display* /*dpy*/,
+    int* /*n_counters_return*/
+);
+
+extern void XSyncFreeSystemCounterList(
+    XSyncSystemCounter* /*list*/
+);
+
+extern XSyncCounter XSyncCreateCounter(
+    Display* /*dpy*/,
+    XSyncValue /*initial_value*/
+);
+
+extern Status XSyncSetCounter(
+    Display* /*dpy*/,
+    XSyncCounter /*counter*/,
+    XSyncValue /*value*/
+);
+
+extern Status XSyncChangeCounter(
+    Display* /*dpy*/,
+    XSyncCounter /*counter*/,
+    XSyncValue /*value*/
+);
+
+extern Status XSyncDestroyCounter(
+    Display* /*dpy*/,
+    XSyncCounter /*counter*/
+);
+
+extern Status XSyncQueryCounter(
+    Display* /*dpy*/,
+    XSyncCounter /*counter*/,
+    XSyncValue* /*value_return*/
+);
+
+extern Status XSyncAwait(
+    Display* /*dpy*/,
+    XSyncWaitCondition* /*wait_list*/,
+    int /*n_conditions*/
+);
+
+extern XSyncAlarm XSyncCreateAlarm(
+    Display* /*dpy*/,
+    unsigned long /*values_mask*/,
+    XSyncAlarmAttributes* /*values*/
+);
+
+extern Status XSyncDestroyAlarm(
+    Display* /*dpy*/,
+    XSyncAlarm /*alarm*/
+);
+
+extern Status XSyncQueryAlarm(
+    Display* /*dpy*/,
+    XSyncAlarm /*alarm*/,
+    XSyncAlarmAttributes* /*values_return*/
+);
+
+extern Status XSyncChangeAlarm(
+    Display* /*dpy*/,
+    XSyncAlarm /*alarm*/,
+    unsigned long /*values_mask*/,
+    XSyncAlarmAttributes* /*values*/
+);
+
+extern Status XSyncSetPriority(
+    Display* /*dpy*/,
+    XID /*client_resource_id*/,
+    int /*priority*/
+);
+
+extern Status XSyncGetPriority(
+    Display* /*dpy*/,
+    XID /*client_resource_id*/,
+    int* /*return_priority*/
+);
+
+extern XSyncFence XSyncCreateFence(
+    Display* /*dpy*/,
+    Drawable /*d*/,
+    Bool /*initially_triggered*/
+);
+
+extern Bool XSyncTriggerFence(
+    Display* /*dpy*/,
+    XSyncFence /*fence*/
+);
+
+extern Bool XSyncResetFence(
+    Display* /*dpy*/,
+    XSyncFence /*fence*/
+);
+
+extern Bool XSyncDestroyFence(
+    Display* /*dpy*/,
+    XSyncFence /*fence*/
+);
+
+extern Bool XSyncQueryFence(
+    Display* /*dpy*/,
+    XSyncFence /*fence*/,
+    Bool* /*triggered*/
+);
+
+extern Bool XSyncAwaitFence(
+    Display* /*dpy*/,
+    const XSyncFence* /*fence_list*/,
+    int /*n_fences*/
+);
+
+_XFUNCPROTOEND
+
+#endif /* _SYNC_SERVER */
+
+#endif /* _SYNC_H_ */
diff --git a/libXext/include/X11/extensions/xtestext1.h b/libXext/include/X11/extensions/xtestext1.h
index 59cdd151d..67d015bb0 100644
--- a/libXext/include/X11/extensions/xtestext1.h
+++ b/libXext/include/X11/extensions/xtestext1.h
@@ -41,8 +41,8 @@ documentation, and that the name of Hewlett-Packard not be used in
 advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
 
-Hewlett-Packard makes no representations about the 
-suitability of this software for any purpose.  It is provided 
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.
 
 This software is not subject to any license of the American