Libc-1439.100.3.tar.gz

[apple/libc.git] / stdlib / FreeBSD / strtouq.c

diff --git a/stdlib/FreeBSD/strtouq.c b/stdlib/FreeBSD/strtouq.c
index c0e0bef4d321e78f1c4a333b3f6d095e308ba0c2..29f0f13c067cbf30b9e03c4f89e408ddb4ca3cb8 100644 (file)
--- a/stdlib/FreeBSD/strtouq.c
+++ b/stdlib/FreeBSD/strtouq.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -35,7 +31,9 @@
 static char sccsid[] = "@(#)strtouq.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)strtouq.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtouq.c,v 1.11 2002/08/15 09:25:04 robert Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtouq.c,v 1.12 2007/01/09 00:28:10 imp Exp $");
+
+#include "xlocale_private.h"

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


@@ -48,5 +46,13 @@ u_quad_t
 strtouq(const char *nptr, char **endptr, int base)
 {
 
 strtouq(const char *nptr, char **endptr, int base)
 {
 

-       return strtoull(nptr, endptr, base);
+       return strtoull_l(nptr, endptr, base, __current_locale());
+}
+
+u_quad_t
+strtouq_l(const char *nptr, char **endptr, int base, locale_t loc)
+{
+
+       /* no need to call NORMALIZE_LOCALE(loc) because strtoull_l will */
+       return strtoull_l(nptr, endptr, base, loc);

 }
 }