Author: ache
Date: Sun Jun  5 18:11:52 2016
New Revision: 301459
URL: https://svnweb.freebsd.org/changeset/base/301459

Log:
  MFC: r301115
  
  Don't use fixup for C99 and up, the compiler result is already correct.
  
  Suggested by: bde

Modified:
  stable/10/lib/libc/stdlib/div.c
  stable/10/lib/libc/stdlib/imaxdiv.c
  stable/10/lib/libc/stdlib/ldiv.c
  stable/10/lib/libc/stdlib/lldiv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/stdlib/div.c
==============================================================================
--- stable/10/lib/libc/stdlib/div.c     Sun Jun  5 17:31:36 2016        
(r301458)
+++ stable/10/lib/libc/stdlib/div.c     Sun Jun  5 18:11:52 2016        
(r301459)
@@ -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: stable/10/lib/libc/stdlib/imaxdiv.c
==============================================================================
--- stable/10/lib/libc/stdlib/imaxdiv.c Sun Jun  5 17:31:36 2016        
(r301458)
+++ stable/10/lib/libc/stdlib/imaxdiv.c Sun Jun  5 18:11:52 2016        
(r301459)
@@ -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: stable/10/lib/libc/stdlib/ldiv.c
==============================================================================
--- stable/10/lib/libc/stdlib/ldiv.c    Sun Jun  5 17:31:36 2016        
(r301458)
+++ stable/10/lib/libc/stdlib/ldiv.c    Sun Jun  5 18:11:52 2016        
(r301459)
@@ -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: stable/10/lib/libc/stdlib/lldiv.c
==============================================================================
--- stable/10/lib/libc/stdlib/lldiv.c   Sun Jun  5 17:31:36 2016        
(r301458)
+++ stable/10/lib/libc/stdlib/lldiv.c   Sun Jun  5 18:11:52 2016        
(r301459)
@@ -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);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to