[Xorg-commit] xc/lib/X11 ConnDis.c,1.1.4.2,1.1.4.3 HVC.c,1.1.4.2,1.1.4.3 SetLocale.c,1.1.4.2,1.1.4.3 cmsColNm.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/X11
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/X11

Modified Files:
      Tag: XORG-CURRENT
	ConnDis.c HVC.c SetLocale.c cmsColNm.c 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: ConnDis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ConnDis.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- ConnDis.c	26 Nov 2003 22:48:35 -0000	1.1.4.2
+++ ConnDis.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
 /*
  
@@ -24,7 +25,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.27 2003/07/20 16:12:14 tsi Exp $ */
+/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
 
 /* 
  * This file contains operating system dependencies.
@@ -1081,6 +1082,32 @@
 	    break;
 	}
 #endif /* AF_INET */
+#if defined(IPv6) && defined(AF_INET6)
+	case AF_INET6:
+	  /* XXX This should probably never happen */
+	{
+	    unsigned char ipv4mappedprefix[] = {
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
+	    
+	    /* In the case of v4 mapped addresses send the v4 
+	       part of the address - addr is already in network byte order */
+	    if (memcmp(addr+8, ipv4mappedprefix, 12) == 0) {
+		for (i = 20 ; i < 24; i++)
+		    xdmcp_data[j++] = ((char *)addr)[i];
+	    
+		/* Port number */
+		for (i=2; i<4; i++)
+		    xdmcp_data[j++] = ((char *)addr)[i];
+		break;
+	    } else {
+		/* Fake data to keep the data aligned. Otherwise the 
+		   the server will bail about incorrect timing data */
+		for (i = 0; i < 8; i++) {
+		    xdmcp_data[j++] = 0;
+		}
+	    }
+	}
+#endif /* AF_INET6 */
 #ifdef AF_UNIX
 	case AF_UNIX:
 	{

Index: HVC.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/HVC.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- HVC.c	26 Nov 2003 22:48:35 -0000	1.1.4.2
+++ HVC.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
 
 /*
@@ -57,8 +58,6 @@
 
 #include <stdio.h>
 
-#include <stdio.h>
-
 /*
  *	DEFINES
  */

Index: SetLocale.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/SetLocale.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- SetLocale.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ SetLocale.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
 
 /*
@@ -65,8 +66,6 @@
 
 #define MAXLOCALE	64	/* buffer size of locale name */
 
-#define MAXLOCALE	64	/* buffer size of locale name */
-
 #ifdef X_LOCALE
 
 /* alternative setlocale() for when the OS does not provide one */

Index: cmsColNm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/cmsColNm.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- cmsColNm.c	26 Nov 2003 22:48:36 -0000	1.1.4.2
+++ cmsColNm.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
 
 /*
@@ -47,7 +48,6 @@
 static Status LoadColornameDB(void);
 
 
-
 /*
  *      LOCAL DEFINES
  *		#define declarations local to this package.