Libc-1044.40.1.tar.gz

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

diff --git a/stdlib/FreeBSD/atoll.c b/stdlib/FreeBSD/atoll.c
index b7c38b8f68a85181be935a53aedcb1bbfebbe5f6..c25a4daff4a8e9dc58ac57fc4f0f46eabc180b56 100644 (file)
--- a/stdlib/FreeBSD/atoll.c
+++ b/stdlib/FreeBSD/atoll.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.
- * 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.
@@ -32,7 +28,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoll.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoll.c,v 1.5 2007/01/09 00:28:09 imp Exp $");
+
+#include "xlocale_private.h"
 
 #include <stdlib.h>
 
@@ -40,5 +38,14 @@ long long
 atoll(str)
        const char *str;
 {
-       return strtoll(str, (char **)NULL, 10);
+       return strtoll_l(str, (char **)NULL, 10, __current_locale());
+}
+
+long long
+atoll_l(str, loc)
+       const char *str;
+       locale_t loc;
+{
+       /* no need to call NORMALIZE_LOCALE(loc) because strtoll_l will */
+       return strtoll_l(str, (char **)NULL, 10, loc);
 }