Use locale_t, not __locale_t, throughout glibc

[thirdparty/glibc.git] / stdlib / strtold_l.c

diff --git a/stdlib/strtold_l.c b/stdlib/strtold_l.c
index 6d134a7677fb96a206ab0a5a4e995285d14602bb..7445379fe0a51de80d5847c4991876a766ecd0ad 100644 (file)
--- a/stdlib/strtold_l.c
+++ b/stdlib/strtold_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2002, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,11 +17,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <xlocale.h>
-
-#if defined _LIBC || defined HAVE_WCHAR_H
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 #ifdef USE_WIDE_CHAR
 # define STRING_TYPE   wchar_t
@@ -39,12 +35,12 @@
 #define INTERNAL1(x) __##x##_internal
 
 extern double INTERNAL (__STRTOD) (const STRING_TYPE *, STRING_TYPE **,
-                                  int, __locale_t);
+                                  int, locale_t);
 
 /* There is no `long double' type, use the `double' implementations.  */
 long double
 INTERNAL (__STRTOLD) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
-                     int group, __locale_t loc)
+                     int group, locale_t loc)
 {
   return INTERNAL (__STRTOD) (nptr, endptr, group, loc);
 }
@@ -54,7 +50,7 @@ libc_hidden_def (INTERNAL (__STRTOLD))
 
 long double
 weak_function
-__STRTOLD (const STRING_TYPE *nptr, STRING_TYPE **endptr, __locale_t loc)
+__STRTOLD (const STRING_TYPE *nptr, STRING_TYPE **endptr, locale_t loc)
 {
   return INTERNAL (__STRTOD) (nptr, endptr, 0, loc);
 }