Libc-763.11.tar.gz

[apple/libc.git] / stdlib / FreeBSD / strtoumax.c.patch

diff --git a/stdlib/FreeBSD/strtoumax.c.patch b/stdlib/FreeBSD/strtoumax.c.patch
index ab7112e755767be293782ebf2ca3eb51ccdaa168..fbbc5e0ba55cb649639aec20d78ce1d9aa28d150 100644 (file)
--- a/stdlib/FreeBSD/strtoumax.c.patch
+++ b/stdlib/FreeBSD/strtoumax.c.patch
@@ -1,15 +1,15 @@
---- strtoumax.c.orig   2003-05-20 15:23:25.000000000 -0700
-+++ strtoumax.c        2005-02-23 13:24:30.000000000 -0800
-@@ -37,6 +37,8 @@
+--- strtoumax.c.bsdnew 2009-11-13 14:11:52.000000000 -0800
++++ strtoumax.c        2009-11-13 14:11:52.000000000 -0800
+@@ -33,6 +33,8 @@ static char sccsid[] = "from @(#)strtoul

  #include <sys/cdefs.h>
  #include <sys/cdefs.h>

- __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.11 2007/01/09 00:28:10 imp Exp $");

  
 +#include "xlocale_private.h"
 +
  #include <ctype.h>
  #include <errno.h>
  #include <stdlib.h>
  
 +#include "xlocale_private.h"
 +
  #include <ctype.h>
  #include <errno.h>
  #include <stdlib.h>

-@@ -49,7 +51,8 @@
+@@ -45,7 +47,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/

   * alphabets and digits are each contiguous.
   */
  uintmax_t
   * alphabets and digits are each contiguous.
   */
  uintmax_t


@@ -19,7 +19,7 @@
  {
        const char *s;
        uintmax_t acc;
  {
        const char *s;
        uintmax_t acc;

-@@ -57,13 +60,14 @@
+@@ -53,13 +56,14 @@ strtoumax(const char * __restrict nptr, 

        uintmax_t cutoff;
        int neg, any, cutlim;
  
        uintmax_t cutoff;
        int neg, any, cutlim;
  


@@ -35,7 +35,7 @@
        if (c == '-') {
                neg = 1;
                c = *s++;
        if (c == '-') {
                neg = 1;
                c = *s++;

-@@ -117,3 +121,9 @@
+@@ -116,3 +120,9 @@ noconv:

                *endptr = (char *)(any ? s - 1 : nptr);
        return (acc);
  }
                *endptr = (char *)(any ? s - 1 : nptr);
        return (acc);
  }