From: Amos Jeffries Date: Tue, 29 Mar 2022 10:32:55 +0000 (+0000) Subject: Remove SCO 3.2 support (#1005) X-Git-Tag: SQUID_6_0_1~218 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23d0a3964d181bccdecf7cfbe1d99a6a7b210b83;p=thirdparty%2Fsquid.git Remove SCO 3.2 support (#1005) This OS is now obsolete. Users wishing to build for this OS can use build time options: ./configure --disable-poll CFLAGS="-lintl" also add to lib/util.c: #define rint(X) floor((X) + 0.5) --- diff --git a/configure.ac b/configure.ac index ea2efb1f4b..2eed09b008 100644 --- a/configure.ac +++ b/configure.ac @@ -2981,9 +2981,8 @@ case "$squid_host_os" in AC_MSG_NOTICE([Use MSVCRT for math functions.]) ;; *) - dnl rint() and log() are only used in old C code for now. + dnl log() are only used in old C code for now. AC_LANG_PUSH([C]) - AC_SEARCH_LIBS([rint],[m]) AC_SEARCH_LIBS([log],[m]) AC_LANG_POP([C]) ;; @@ -3038,16 +3037,6 @@ fi SQUID_CHECK_SS_LEN_IN_SOCKADDR_STORAGE SQUID_CHECK_SIN_LEN_IN_SOCKADDR_IN - -dnl -lintl is needed on SCO version 3.2v4.2 for strftime() -dnl Robert Side -dnl Mon, 18 Jan 1999 17:48:00 GMT -case "$host" in - *-pc-sco3.2*) - AC_CHECK_LIB(intl, strftime) - ;; -esac - dnl System-specific library modifications dnl AH_TEMPLATE(GETTIMEOFDAY_NO_TZP,[If gettimeofday is known to take only one argument]) @@ -3137,12 +3126,6 @@ if test "x$ac_cv_func_poll" = "x" ; then AC_MSG_NOTICE([disabling poll for $host...]) ac_cv_func_poll='no' ;; - [*-pc-sco3.2*]) - # Robert Side - # Mon, 18 Jan 1999 17:48:00 GMT - AC_MSG_NOTICE([disabling poll for $host...]) - ac_cv_func_poll='no' - ;; esac fi diff --git a/lib/util.c b/lib/util.c index 64620f8cc6..9213e892b8 100644 --- a/lib/util.c +++ b/lib/util.c @@ -59,12 +59,7 @@ xpercent(double part, double whole) int xpercentInt(double part, double whole) { -#if HAVE_RINT return (int) rint(xpercent(part, whole)); -#else - /* SCO 3.2v4.2 doesn't have rint() -- mauri@mbp.ee */ - return (int) floor(xpercent(part, whole) + 0.5); -#endif } /* somewhat safer division */