From owner-svn-src-head@freebsd.org Wed Jun 1 10:14:27 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48188B58706; Wed, 1 Jun 2016 10:14:27 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F149712BE; Wed, 1 Jun 2016 10:14:26 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u51AEQ8B090431; Wed, 1 Jun 2016 10:14:26 GMT (envelope-from ache@FreeBSD.org) Received: (from ache@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u51AEPFX090427; Wed, 1 Jun 2016 10:14:25 GMT (envelope-from ache@FreeBSD.org) Message-Id: <201606011014.u51AEPFX090427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ache set sender to ache@FreeBSD.org using -f From: "Andrey A. Chernov" Date: Wed, 1 Jun 2016 10:14:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301115 - head/lib/libc/stdlib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2016 10:14:27 -0000 Author: ache Date: Wed Jun 1 10:14:25 2016 New Revision: 301115 URL: https://svnweb.freebsd.org/changeset/base/301115 Log: Don't use fixup for C99 and up, the compiler result is already correct. Suggested by: bde MFC after: 1 week Modified: head/lib/libc/stdlib/div.c head/lib/libc/stdlib/imaxdiv.c head/lib/libc/stdlib/ldiv.c head/lib/libc/stdlib/lldiv.c Modified: head/lib/libc/stdlib/div.c ============================================================================== --- head/lib/libc/stdlib/div.c Wed Jun 1 10:14:04 2016 (r301114) +++ head/lib/libc/stdlib/div.c Wed Jun 1 10:14:25 2016 (r301115) @@ -46,6 +46,7 @@ div(num, denom) r.quot = num / denom; r.rem = num % denom; +#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) /* * The ANSI standard says that |r.quot| <= |n/d|, where * n/d is to be computed in infinite precision. In other @@ -73,5 +74,6 @@ div(num, denom) r.quot++; r.rem -= denom; } +#endif return (r); } Modified: head/lib/libc/stdlib/imaxdiv.c ============================================================================== --- head/lib/libc/stdlib/imaxdiv.c Wed Jun 1 10:14:04 2016 (r301114) +++ head/lib/libc/stdlib/imaxdiv.c Wed Jun 1 10:14:25 2016 (r301115) @@ -37,9 +37,11 @@ imaxdiv(intmax_t numer, intmax_t denom) retval.quot = numer / denom; retval.rem = numer % denom; +#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) if (numer >= 0 && retval.rem < 0) { retval.quot++; retval.rem -= denom; } +#endif return (retval); } Modified: head/lib/libc/stdlib/ldiv.c ============================================================================== --- head/lib/libc/stdlib/ldiv.c Wed Jun 1 10:14:04 2016 (r301114) +++ head/lib/libc/stdlib/ldiv.c Wed Jun 1 10:14:25 2016 (r301115) @@ -48,9 +48,11 @@ ldiv(num, denom) r.quot = num / denom; r.rem = num % denom; +#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) if (num >= 0 && r.rem < 0) { r.quot++; r.rem -= denom; } +#endif return (r); } Modified: head/lib/libc/stdlib/lldiv.c ============================================================================== --- head/lib/libc/stdlib/lldiv.c Wed Jun 1 10:14:04 2016 (r301114) +++ head/lib/libc/stdlib/lldiv.c Wed Jun 1 10:14:25 2016 (r301115) @@ -37,9 +37,11 @@ lldiv(long long numer, long long denom) retval.quot = numer / denom; retval.rem = numer % denom; +#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) if (numer >= 0 && retval.rem < 0) { retval.quot++; retval.rem -= denom; } +#endif return (retval); }