Merge remote-tracking branch 'origin/released'

* origin/released:
  libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013

Conflicts:
	mesalib/src/glsl/glcpp/.gitignore

7 files changed, 49 insertions, 128 deletions

diff --git a/libX11/include/X11/Xcms.h b/libX11/include/X11/Xcms.h
index 8151fd1f3..663185410 100644
--- a/libX11/include/X11/Xcms.h
+++ b/libX11/include/X11/Xcms.h
@@ -31,6 +31,14 @@
 
 #include <X11/Xlib.h>
 
+/* The Xcms structs are full of implicit padding to properly align members.
+   We can't clean that up without breaking ABI, so tell clang not to bother
+   complaining about it. */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
     /*
      * XCMS Status Values
      */
@@ -798,6 +806,10 @@ extern Visual *XcmsVisualOfCCC (
     XcmsCCC		/* ccc */
 );
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 _XFUNCPROTOEND
 
 #endif /* _X11_XCMS_H_ */
diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h
index 3a73d7b83..112b85a94 100644
--- a/libX11/include/X11/Xlib.h
+++ b/libX11/include/X11/Xlib.h
@@ -81,6 +81,14 @@ _Xmblen(
    November 2000. Its presence is indicated through the following macro. */
 #define X_HAVE_UTF8_STRING 1
 
+/* The Xlib structs are full of implicit padding to properly align members.
+   We can't clean that up without breaking ABI, so tell clang not to bother
+   complaining about it. */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 typedef char *XPointer;
 
 typedef int Bool;
@@ -4019,6 +4027,10 @@ extern void XFreeEventData(
     XGenericEventCookie*	/* cookie*/
 );
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 _XFUNCPROTOEND
 
 #endif /* _X11_XLIB_H_ */
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index 84abd7319..03856a671 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -42,6 +42,14 @@ from The Open Group.
 #include <X11/Xproto.h>		/* to declare xEvent */
 #include <X11/XlibConf.h>	/* for configured options like XTHREADS */
 
+/* The Xlib structs are full of implicit padding to properly align members.
+   We can't clean that up without breaking ABI, so tell clang not to bother
+   complaining about it. */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 #ifdef WIN32
 #define _XFlush _XFlushIt
 #endif
@@ -1367,6 +1375,10 @@ extern void xlocaledir(
     int buf_len
 );
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 _XFUNCPROTOEND
 
 #endif /* _X11_XLIBINT_H_ */
diff --git a/libX11/include/X11/Xutil.h b/libX11/include/X11/Xutil.h
index 8cab50e7d..62cdf5556 100644
--- a/libX11/include/X11/Xutil.h
+++ b/libX11/include/X11/Xutil.h
@@ -53,6 +53,14 @@ SOFTWARE.
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
+/* The Xlib structs are full of implicit padding to properly align members.
+   We can't clean that up without breaking ABI, so tell clang not to bother
+   complaining about it. */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 /*
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
  * value (x, y, width, height) was found in the parsed string.
@@ -821,6 +829,10 @@ extern int XXorRegion(
     Region		/* dr_return */
 );
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 _XFUNCPROTOEND
 
 #endif /* _X11_XUTIL_H_ */
diff --git a/libX11/modules/im/ximcp/imTransR.c b/libX11/modules/im/ximcp/imTransR.c
index 1fd008870..caa530904 100644
--- a/libX11/modules/im/ximcp/imTransR.c
+++ b/libX11/modules/im/ximcp/imTransR.c
@@ -66,12 +66,6 @@ TransportSW _XimTransportRec[] = {
 #if defined(UNIXCONN) || defined(LOCALCONN)
     { "local",      _XimTransConf }, /* use X transport lib */
 #endif /* UNIXCONN */
-#ifdef DNETCONN
-    { "dnet",     _XimTransConf }, /* use X transport lib */
-#endif /* DNETCONN */
-#ifdef STREAMSCONN
-    { "streams",    _XimTransConf }, /* use X transport lib */
-#endif /* STREAMSCONN */
     { (char *)NULL, (Bool (*)(Xim, char *))NULL },
 };
 
diff --git a/libX11/src/globals.c b/libX11/src/globals.c
index 89e38a744..b7e49dda5 100644
--- a/libX11/src/globals.c
+++ b/libX11/src/globals.c
@@ -87,127 +87,6 @@ ZEROINIT (int, _Xdebug, 0);
 ZEROINIT (Display *, _XHeadOfDisplayList, NULL);
 
 
-
-#if 0
-#ifdef STREAMSCONN
-
-
-/* The following are how the Xstream connections are used:              */
-/*      1)      Local connections over pseudo-tty ports.                */
-/*      2)      SVR4 local connections using named streams or SVR3.2    */
-/*              local connections using streams.                        */
-/*      3)      SVR4 stream pipe code. This code is proprietary and     */
-/*              the actual code is not included in the XC distribution. */
-/*      4)      remote connections using tcp                            */
-/*      5)      remote connections using StarLan                        */
-
-/*
- * descriptor block for streams connections
- */
-
-#include "Xstreams.h"
-
-char _XsTypeOfStream[100] = { 0 };
-
-extern int write();
-extern int close();
-#ifdef SVR4
-extern int _XsSetupSpStream();
-extern int _XsSetupNamedStream();
-#endif
-extern int _XsSetupLocalStream();
-extern int _XsConnectLocalClient();
-extern int _XsCallLocalServer();
-extern int _XsReadLocalStream();
-extern int _XsErrorCall();
-extern int _XsWriteLocalStream();
-extern int _XsCloseLocalStream();
-extern int _XsSetupTliStream();
-extern int _XsConnectTliClient();
-extern int _XsCallTliServer();
-extern int _XsReadTliStream();
-extern int _XsWriteTliStream();
-extern int _XsCloseTliStream();
-
-
-Xstream _XsStream[] = {
-
-    {
-	/* local connections using pseudo-ttys */
-
-	_XsSetupLocalStream,
-	_XsConnectLocalClient,
-	_XsCallLocalServer,
-	_XsReadLocalStream,
-	_XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    {
-#ifdef SVR4
-	/* local connections using named streams */
-
-        _XsSetupNamedStream,
-#else
-	/* local connections using streams */
-        _XsSetupLocalStream,
-#endif
-        _XsConnectLocalClient,
-        _XsCallLocalServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-        write,
-        close,
-        NULL
-    },
-    /* Enhanced Application Compatibility Support */
-    {
-#ifdef SVR4
-	/* SVR4 stream pipe code */
-	_XsSetupSpStream,
-#else
-	_XsSetupLocalStream,
-#endif
-	_XsConnectLocalClient,
-	_XsCallLocalServer,
-	_XsReadLocalStream,
-	_XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    /* End Enhanced Application Compatibility Support */
-
-    {
-	/* remote connections using tcp */
-        _XsSetupTliStream,
-        _XsConnectTliClient,
-        _XsCallTliServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-	write,
-	close,
-	NULL
-    },
-    {
-	/* remote connections using StarLan */
-        _XsSetupTliStream,
-        _XsConnectTliClient,
-        _XsCallTliServer,
-        _XsReadLocalStream,
-        _XsErrorCall,
-        write,
-        close,
-        NULL
-    }
-};
-
-
-#endif /* STREAMSCONN */
-#endif
-
-
 #ifdef XTEST1
 /*
  * Stuff for input synthesis extension:
diff --git a/libX11/src/xlibi18n/XimTrInt.h b/libX11/src/xlibi18n/XimTrInt.h
index a08ac0308..bceab9886 100644
--- a/libX11/src/xlibi18n/XimTrInt.h
+++ b/libX11/src/xlibi18n/XimTrInt.h
@@ -73,7 +73,7 @@ extern Bool	_XimXConf(
     char	*address
 );
 
-#if defined(TCPCONN) || defined(UNIXCONN) || defined(DNETCONN) || defined(STREAMSCONN)
+#if defined(TCPCONN) || defined(UNIXCONN)
 
 extern Bool	_XimTransConf(
     Xim		 im,