diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-07 10:23:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-07 10:23:19 -0400 |
| commit | 339ddc413559d4cb117a72f87b2a70dae6911c32 (patch) | |
| tree | 913f8e391c8ba334794c779367e7aa0d6cdd8387 /Xtransutil.c | |
| parent | a78b9819cbbbddccb4a6bf364b88ec4f27d25c1f (diff) | |
Massive ifdef cleanup, dropping a ton of unsupported platform code.
Diffstat (limited to 'Xtransutil.c')
| -rw-r--r-- | Xtransutil.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Xtransutil.c b/Xtransutil.c index f68b1e7..ea9e650 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -104,17 +104,8 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) */ struct sockaddr_in saddr; -#ifdef CRAY -#ifdef OLDTCP - int len = sizeof(saddr.sin_addr); -#else - int len = SIZEOF_in_addr; -#endif /* OLDTCP */ - char *cp = (char *) &saddr.sin_addr; -#else /* else not CRAY */ int len = sizeof(saddr.sin_addr.s_addr); char *cp = (char *) &saddr.sin_addr.s_addr; -#endif /* CRAY */ memcpy (&saddr, *addrp, sizeof (struct sockaddr_in)); @@ -184,7 +175,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) } #endif /* defined(DNETCONN) */ -#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(LOCALCONN) case AF_UNIX: { *familyp=FamilyLocal; @@ -267,7 +258,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr) switch (family) { -#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) case AF_UNIX: { struct sockaddr_un *saddr = (struct sockaddr_un *) addr; @@ -369,7 +360,7 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr) switch (family) { case AF_UNSPEC: -#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) case AF_UNIX: { if (gethostname (addrbuf, sizeof (addrbuf)) == 0) |