about summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/uchar.h4
-rw-r--r--wcsmbs/wchar.h20
-rw-r--r--wcsmbs/wcstol_l.c1
-rw-r--r--wcsmbs/wcstoll_l.c1
-rw-r--r--wcsmbs/wcstoul_l.c1
-rw-r--r--wcsmbs/wcstoull_l.c1
6 files changed, 9 insertions, 19 deletions
diff --git a/wcsmbs/uchar.h b/wcsmbs/uchar.h
index f1108edc6a..1189f05fd0 100644
--- a/wcsmbs/uchar.h
+++ b/wcsmbs/uchar.h
@@ -25,10 +25,8 @@
 
 #include <features.h>
 
-#define __need_size_t
-#include <stddef.h>
-
 #include <bits/types.h>
+#include <bits/types/size_t.h>
 #include <bits/types/mbstate_t.h>
 
 #ifndef __USE_ISOCXX11
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 5e0d65b14e..71e53c8b4c 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -27,20 +27,16 @@
 #include <bits/libc-header-start.h>
 
 /* Gather machine dependent type support.  */
-#include <bits/floatn.h>
-
-#define __need_size_t
-#define __need_wchar_t
-#define __need_NULL
-#include <stddef.h>
-
-#define __need___va_list
-#include <stdarg.h>
+#include <bits/types/__FILE.h>
+#include <bits/types/__va_list.h>
+#include <bits/types/mbstate_t.h>
+#include <bits/types/size_t.h>
+#include <bits/types/wchar_t.h>
+#include <bits/types/wint_t.h>
 
+#include <bits/NULL.h>
+#include <bits/floatn.h>
 #include <bits/wchar.h>
-#include <bits/types/wint_t.h>
-#include <bits/types/mbstate_t.h>
-#include <bits/types/__FILE.h>
 
 #if defined __USE_UNIX98 || defined __USE_XOPEN2K
 # include <bits/types/FILE.h>
diff --git a/wcsmbs/wcstol_l.c b/wcsmbs/wcstol_l.c
index 33625c1854..3cf1fba3d2 100644
--- a/wcsmbs/wcstol_l.c
+++ b/wcsmbs/wcstol_l.c
@@ -17,7 +17,6 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define __need_wchar_t
 #include <stddef.h>
 #include <locale.h>
 
diff --git a/wcsmbs/wcstoll_l.c b/wcsmbs/wcstoll_l.c
index 63d7d01b76..6a93a754f3 100644
--- a/wcsmbs/wcstoll_l.c
+++ b/wcsmbs/wcstoll_l.c
@@ -17,7 +17,6 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define __need_wchar_t
 #include <stddef.h>
 #include <locale.h>
 
diff --git a/wcsmbs/wcstoul_l.c b/wcsmbs/wcstoul_l.c
index 540ff9c817..cba6eff09c 100644
--- a/wcsmbs/wcstoul_l.c
+++ b/wcsmbs/wcstoul_l.c
@@ -17,7 +17,6 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define __need_wchar_t
 #include <stddef.h>
 #include <locale.h>
 
diff --git a/wcsmbs/wcstoull_l.c b/wcsmbs/wcstoull_l.c
index aa93c1b06f..e3eef71ec8 100644
--- a/wcsmbs/wcstoull_l.c
+++ b/wcsmbs/wcstoull_l.c
@@ -17,7 +17,6 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#define __need_wchar_t
 #include <stddef.h>
 #include <locale.h>