diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:17 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:17 +0000 |
| commit | c4d0d886204ec28e6f6db57dc64859e921ca41fd (patch) | |
| tree | 7f91b320336c936dea60a145e3eef2ad6c1aab91 /xhost.c | |
| parent | 6acfe587565e7b2b268f45057d77f4790545eea0 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
Diffstat (limited to 'xhost.c')
| -rw-r--r-- | xhost.c | 23 |
1 files changed, 5 insertions, 18 deletions
@@ -1,5 +1,5 @@ /* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/xhost/xhost.c,v 1.1.4.2.6.2 2004/03/17 17:39:37 alanc Exp $ */ +/* $XdotOrg: xc/programs/xhost/xhost.c,v 1.3 2004/07/27 06:06:06 herrb Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group @@ -37,7 +37,7 @@ X Window System is a trademark of The Open Group. */ /* $XFree86: xc/programs/xhost/xhost.c,v 3.26 2003/07/27 14:05:45 herrb Exp $ */ -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) +#if defined(TCPCONN) || defined(STREAMSCONN) #define NEEDSOCKETS #endif #ifdef UNIXCONN @@ -316,16 +316,12 @@ change_host(Display *dpy, char *name, Bool add) krb5_data kbuf; #endif #ifdef NEEDSOCKETS -#ifndef AMTCPCONN static struct in_addr addr; /* so we can point at it */ #if defined(IPv6) && defined(AF_INET6) static struct in6_addr addr6; /* so we can point at it */ #else struct hostent *hp; #endif -#else - static ipaddr_t addr; -#endif #endif char *cp; #ifdef DNETCONN @@ -346,7 +342,7 @@ change_host(Display *dpy, char *name, Bool add) } lname[namelen] = '\0'; if (!strncmp("inet:", lname, 5)) { -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) +#if defined(TCPCONN) || defined(STREAMSCONN) family = FamilyInternet; name += 5; #else @@ -559,13 +555,8 @@ change_host(Display *dpy, char *name, Bool add) /* * First see if inet_addr() can grok the name; if so, then use it. */ -#ifndef AMTCPCONN if (((family == FamilyWild) || (family == FamilyInternet)) && ((addr.s_addr = inet_addr(name)) != -1)) { -#else - if (((family == FamilyWild) || (family == FamilyInternet)) && - ((addr = inet_addr(name)) != -1)) { -#endif ha.family = FamilyInternet; ha.length = 4; /* but for Cray would be sizeof(addr.s_addr) */ ha.address = (char *)&addr; /* but for Cray would be &addr.s_addr */ @@ -709,7 +700,7 @@ jmp_buf env; static char * get_hostname(XHostAddress *ha) { -#if (defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)) && \ +#if (defined(TCPCONN) || defined(STREAMSCONN)) && \ (!defined(IPv6) || !defined(AF_INET6)) static struct hostent *hp = NULL; #endif @@ -727,7 +718,7 @@ get_hostname(XHostAddress *ha) struct sigaction sa; #endif -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) +#if defined(TCPCONN) || defined(STREAMSCONN) #if defined(IPv6) && defined(AF_INET6) if ((ha->family == FamilyInternet) || (ha->family == FamilyInternet6)) { struct sockaddr_storage saddr; @@ -817,11 +808,7 @@ get_hostname(XHostAddress *ha) alarm(0); if (hp) return (hp->h_name); -#ifndef AMTCPCONN else return (inet_ntoa(*((struct in_addr *)(ha->address)))); -#else - else return (inet_ntoa(*((ipaddr_t *)(ha->address)))); -#endif } #endif /* IPv6 */ #endif |