Imported Upstream version 7.0.26

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 70368c0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#              X.Org module default exclusion patterns
-#              The next section if for module specific patterns
-#
-#      Do not edit the following section
-#      GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-#      Do not edit the following section
-#      Edit Compile Debug Document Distribute
-*~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-#              Add & Override patterns for x11proto 
-#
-#              Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
-Xfuncproto.h
-Xpoll.h
-do-not-use-config.h
-do-not-use-config.h.in

diff --git a/Xdefs.h b/Xdefs.h
index 46ffdad..e25a208 100644 (file)
--- a/Xdefs.h
+++ b/Xdefs.h
@@ -101,8 +101,8 @@ typedef FSID AccContext;
 typedef struct timeval **OSTimePtr;
 
 
-typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
+typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
                                     OSTimePtr /* pTimeout */,
-                                    pointer /* pReadmask */);
+                                    void * /* pReadmask */);
 
 #endif

diff --git a/Xpoll.h.in b/Xpoll.h.in
index 8275658..0a05424 100644 (file)
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -50,7 +50,7 @@ from The Open Group.
 #ifndef _XPOLL_H_
 #define _XPOLL_H_
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(__CYGWIN__)
 
 #ifndef USE_POLL
 

diff --git a/Xproto.h b/Xproto.h
index 76e2c99..6cdea89 100644 (file)
--- a/Xproto.h
+++ b/Xproto.h
@@ -259,10 +259,13 @@ restoring the definitions in X.h.  */
 typedef CARD16 KeyButMask;
 
 /***************** 
-   connection setup structure.  This is followed by
-   numRoots xWindowRoot structs.
+   Connection setup structures.  See Chapter 8: Connection Setup
+   of the X Window System Protocol specification for details.
 *****************/
 
+/* Client initiates handshake with this data, followed by the strings
+ * for the auth protocol & data.
+ */
 typedef struct {
     CARD8      byteOrder;
     BYTE       pad;
@@ -272,6 +275,16 @@ typedef struct {
     CARD16     pad2 B16;
 } xConnClientPrefix;
 
+/* Server response to xConnClientPrefix.
+ *
+ * If success == Success, this is followed by xConnSetup and
+ * numRoots xWindowRoot structs.
+ *
+ * If success == Failure, this is followed by a reason string.
+ *
+ * The protocol also defines a case of success == Authenticate, but
+ * that doesn't seem to have ever been implemented by the X Consortium.
+ */
 typedef struct {
     CARD8          success;
     BYTE           lengthReason; /*num bytes in string following if failure */

diff --git a/Xthreads.h b/Xthreads.h
index 3d44208..2027127 100644 (file)
--- a/Xthreads.h
+++ b/Xthreads.h
@@ -107,6 +107,7 @@ typedef struct {
     struct _xthread_waiter *waiters;
 } xcondition_rec;
 typedef CRITICAL_SECTION xmutex_rec;
+extern void _Xthread_init(void);
 #    define xthread_init() _Xthread_init()
 #    define xthread_self GetCurrentThreadId
 #    define xthread_fork(func,closure) { \

diff --git a/Xwindows.h b/Xwindows.h
index e6be6ee..70e1deb 100644 (file)
--- a/Xwindows.h
+++ b/Xwindows.h
@@ -63,6 +63,10 @@ The Open Group.
 #define _NO_BOOL_TYPEDEF
 #define BOOL WINBOOL
 #define INT32 wINT32
+#ifdef __x86_64__
+#define INT64 wINT64
+#define LONG64 wLONG64
+#endif
 #undef Status
 #define Status wStatus
 #define ATOM wATOM
@@ -75,6 +79,8 @@ The Open Group.
 #undef BYTE
 #undef BOOL
 #undef INT32
+#undef INT64
+#undef LONG64
 #undef ATOM
 #undef FreeResource
 #undef CreateWindowA

diff --git a/configure.ac b/configure.ac
index 04f1238..355fd0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.25],
+AC_INIT([Xproto], [7.0.26],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

diff --git a/specs/.gitignore b/specs/.gitignore
deleted file mode 100644 (file)
index 0d40e0d..0000000
--- a/specs/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.html
-*.pdf
-*.ps
-*.txt
-*.db

diff --git a/specs/SIAddresses/.gitignore b/specs/SIAddresses/.gitignore
deleted file mode 100644 (file)
index a50f54b..0000000
--- a/specs/SIAddresses/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Override *.txt from toplevel .gitignore
-!hostname.txt
-!IPv6.txt
-!localuser.txt