From da696ae7949a8e0a7db12fefb2c68aff67b74654 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 May 2016 23:46:43 +0000 Subject: [PATCH] drop FreeBSD < 4 support * NEWS: drop FreeBSD < 4 support. The most recent version affected by this is 3.5 and was released in 2000. https://www.freebsd.org/releases/3.5R/announce.html https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ NEWS | 2 ++ numeric.c | 9 +-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e066b20fb9..52444bfc09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri May 13 08:46:42 2016 cremno + + * NEWS: drop FreeBSD < 4 support. + The most recent version affected by this is 3.5 and was released + in 2000. + https://www.freebsd.org/releases/3.5R/announce.html + https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history + Fri May 13 03:12:09 2016 NARUSE, Yui * include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h. diff --git a/NEWS b/NEWS index b55a9c7353..6dcab9c3c2 100644 --- a/NEWS +++ b/NEWS @@ -108,6 +108,8 @@ with all sufficient information, see the ChangeLog file or Redmine === Supported platform changes +* FreeBSD < 4 is no longer supported + === Implementation improvements * In some condition, `[x, y].max` and `[x, y].min` are optimized diff --git a/numeric.c b/numeric.c index 574112faae..e2a14b2d06 100644 --- a/numeric.c +++ b/numeric.c @@ -16,10 +16,6 @@ #include #include -#if defined(__FreeBSD__) && __FreeBSD__ < 4 -#include -#endif - #ifdef HAVE_FLOAT_H #include #endif @@ -4871,10 +4867,7 @@ Init_Numeric(void) #undef rb_intern #define rb_intern(str) rb_intern_const(str) -#if defined(__FreeBSD__) && __FreeBSD__ < 4 - /* allow divide by zero -- Inf */ - fpsetmask(fpgetmask() & ~(FP_X_DZ|FP_X_INV|FP_X_OFL)); -#elif defined(_UNICOSMP) +#ifdef _UNICOSMP /* Turn off floating point exceptions for divide by zero, etc. */ _set_Creg(0, 0); #endif