From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com>
Date: Tue, 25 Mar 2025 21:48:42 +0000 (+0000)
Subject: Remove NEWSOS detection and code (#2035)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13dbfb1322f1eb5efd348f4f61f851f3d050ef42;p=thirdparty%2Fsquid.git

Remove NEWSOS detection and code (#2035)

Sony Network Engineering Workstation was discontinued in 1998.
---

diff --git a/compat/osdetect.h b/compat/osdetect.h
index 8f40c2cfee..5dfe6e6a13 100644
--- a/compat/osdetect.h
+++ b/compat/osdetect.h
@@ -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
 
diff --git a/configure.ac b/configure.ac
index cfba1e2a00..57800a3849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/comm.cc b/src/comm.cc
index e27a8fd5cf..0a0df0cf70 100644
--- a/src/comm.cc
+++ b/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
     }