Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xcalc/math.c
	freetype/src/base/ftbdf.c
	freetype/src/base/fttype1.c
	freetype/src/pfr/pfrobjs.c
	mesalib/src/mesa/main/.gitignore
	openssl/Configure
	openssl/Makefile
	openssl/crypto/cryptlib.c
	openssl/crypto/opensslconf.h
	openssl/test/v3nametest.c
	openssl/util/mk1mf.pl
	openssl/util/pl/VC-32.pl
	xorg-server/Xi/xipassivegrab.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/getevents.c
	xorg-server/glx/glxcmds.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/hw/xwin/winclipboard/internal.h
	xorg-server/hw/xwin/winclipboard/thread.c
	xorg-server/hw/xwin/winclipboard/wndproc.c
	xorg-server/hw/xwin/winclipboard/xevents.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/render/render.c

1 files changed, 65 insertions, 0 deletions

diff --git a/libXfixes/src/Xfixesint.h b/libXfixes/src/Xfixesint.h
new file mode 100644
index 000000000..efea799f2
--- /dev/null
+++ b/libXfixes/src/Xfixesint.h
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+ *
+ * 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 Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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 _XFIXESINT_H_
+#define _XFIXESINT_H_
+
+#include <stdio.h>
+#include <X11/Xlib.h>
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/xfixesproto.h>
+
+extern char XFixesExtensionName[];
+
+typedef struct _XFixesExtDisplayInfo {
+    struct _XFixesExtDisplayInfo  *next;    /* keep a linked list */
+    Display                 *display;	    /* which display this is */
+    XExtCodes               *codes;	    /* the extension protocol codes */
+    int			    major_version;  /* -1 means we don't know */
+    int			    minor_version;  /* -1 means we don't know */
+} XFixesExtDisplayInfo;
+
+/* replaces XExtensionInfo */
+typedef struct _XFixesExtInfo {
+    XFixesExtDisplayInfo    *head;          /* start of the list */
+    XFixesExtDisplayInfo    *cur;           /* most recently used */
+    int                     ndisplays;      /* number of displays */
+} XFixesExtInfo;
+
+extern XFixesExtInfo XFixesExtensionInfo;
+extern char XFixesExtensionName[];
+
+XFixesExtDisplayInfo *
+XFixesFindDisplay (Display *dpy);
+
+#define XFixesHasExtension(i) ((i) && ((i)->codes))
+
+#define XFixesCheckExtension(dpy,i,val) \
+  if (!XFixesHasExtension(i)) { return val; }
+
+#define XFixesSimpleCheckExtension(dpy,i) \
+  if (!XFixesHasExtension(i)) { return; }
+
+#endif /* _XFIXESINT_H_ */