mirror of
https://github.com/squid-cache/squid.git
synced 2025-04-18 22:04:07 +03:00
Remove NEWSOS detection and code (#2035)
Sony Network Engineering Workstation was discontinued in 1998.
This commit is contained in:
parent
25a99dc6ea
commit
13dbfb1322
@ -73,9 +73,6 @@
|
||||
#elif defined(__APPLE__)
|
||||
#define _SQUID_APPLE_ 1
|
||||
|
||||
#elif defined(sony_news) && defined(__svr4)
|
||||
#define _SQUID_NEWSOS6_ 1
|
||||
|
||||
#elif defined(__QNX__)
|
||||
#define _SQUID_QNX_ 1
|
||||
|
||||
|
@ -2087,9 +2087,7 @@ assert(myBar != NULL);
|
||||
])
|
||||
],
|
||||
|
||||
[*-*-solaris2.[[0-4]]],[AC_DEFINE(GETTIMEOFDAY_NO_TZP,1)],
|
||||
|
||||
[*-sony-newsos[[56]]*],[AC_DEFINE(GETTIMEOFDAY_NO_TZP,1)]
|
||||
[*-*-solaris2.[[0-4]]],[AC_DEFINE(GETTIMEOFDAY_NO_TZP,1)]
|
||||
)
|
||||
|
||||
dnl This has to be before AC_CHECK_FUNCS
|
||||
|
13
src/comm.cc
13
src/comm.cc
@ -692,18 +692,6 @@ comm_connect_addr(int sock, const Ip::Address &address)
|
||||
|
||||
} else {
|
||||
errno = 0;
|
||||
#if _SQUID_NEWSOS6_
|
||||
/* Makoto MATSUSHITA <matusita@ics.es.osaka-u.ac.jp> */
|
||||
if (connect(sock, AI->ai_addr, AI->ai_addrlen) < 0)
|
||||
xerrno = errno;
|
||||
|
||||
if (xerrno == EINVAL) {
|
||||
errlen = sizeof(err);
|
||||
x = getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen);
|
||||
if (x >= 0)
|
||||
xerrno = x;
|
||||
}
|
||||
#else
|
||||
errlen = sizeof(err);
|
||||
x = getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen);
|
||||
if (x == 0)
|
||||
@ -720,7 +708,6 @@ comm_connect_addr(int sock, const Ip::Address &address)
|
||||
xerrno = ENOTCONN;
|
||||
else
|
||||
xerrno = errno;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user