diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-06 13:22:41 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-06 13:22:41 +0000 |
| commit | 45fea38d094038f61ed0d6845030c73feba306c4 (patch) | |
| tree | c3d44eb8baad5e902e756871e789eea9cba4d58f /src | |
| parent | ee743606b5b1ce59ab1c23d219d58b04cdf7bd68 (diff) | |
merge XFree86 4.3.99.901 (RC1) from vendor branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/ConnDis.c | 29 | ||||
| -rw-r--r-- | src/SetLocale.c | 3 | ||||
| -rw-r--r-- | src/xcms/HVC.c | 3 | ||||
| -rw-r--r-- | src/xcms/cmsColNm.c | 2 |
4 files changed, 31 insertions, 6 deletions
diff --git a/src/ConnDis.c b/src/ConnDis.c index 667214c7..739d49b0 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -1,3 +1,4 @@ +/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */ /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* @@ -24,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings 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 @@ GetAuthorization( 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: { diff --git a/src/SetLocale.c b/src/SetLocale.c index c44c3bc3..decfcf55 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,3 +1,4 @@ +/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */ /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* @@ -65,8 +66,6 @@ from The Open Group. #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 */ diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c index c283be3d..3ec062ee 100644 --- a/src/xcms/HVC.c +++ b/src/xcms/HVC.c @@ -1,3 +1,4 @@ +/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */ /* $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 */ diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c index 4b133cb5..4699a7b4 100644 --- a/src/xcms/cmsColNm.c +++ b/src/xcms/cmsColNm.c @@ -1,3 +1,4 @@ +/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */ /* $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. |