summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-14 19:33:11 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-14 19:33:11 -0500
commitc247ebdd989365d20da3ce41fdeb2002e0a1ba13 (patch)
tree8bb6738a2b6e1503b012a995245ae6fbdea2ff6f /src
parent5377715ce07269131f011e6f4e978fb5dbf0b294 (diff)
downloadmusl-c247ebdd989365d20da3ce41fdeb2002e0a1ba13.tar.gz
more header fixes, minor warning fix
Diffstat (limited to 'src')
-rw-r--r--src/ctype/wcwidth.c1
-rw-r--r--src/stdlib/strtoimax.c4
-rw-r--r--src/stdlib/wcstoimax.c1
-rw-r--r--src/stdlib/wcstoumax.c1
4 files changed, 5 insertions, 2 deletions
diff --git a/src/ctype/wcwidth.c b/src/ctype/wcwidth.c
index ebc560a5..eaafd7cb 100644
--- a/src/ctype/wcwidth.c
+++ b/src/ctype/wcwidth.c
@@ -1,5 +1,6 @@
#include <inttypes.h>
#include <wchar.h>
+#include <wctype.h>
#define R(a,b,w) { (b), (w)/2, (b)-(a) }
diff --git a/src/stdlib/strtoimax.c b/src/stdlib/strtoimax.c
index 19691091..aeb0397f 100644
--- a/src/stdlib/strtoimax.c
+++ b/src/stdlib/strtoimax.c
@@ -4,7 +4,7 @@
intmax_t strtoimax(const char *s1, char **p, int base)
{
- const unsigned char *s = s1;
+ const unsigned char *s = (const void *)s1;
int sign = 0;
uintmax_t x;
@@ -15,7 +15,7 @@ intmax_t strtoimax(const char *s1, char **p, int base)
if (*s == '-') sign = *s++;
else if (*s == '+') s++;
- x = strtoumax(s, p, base);
+ x = strtoumax((const void *)s, p, base);
if (x > INTMAX_MAX) {
if (!sign || -x != INTMAX_MIN)
errno = ERANGE;
diff --git a/src/stdlib/wcstoimax.c b/src/stdlib/wcstoimax.c
index 861fcb54..59894f60 100644
--- a/src/stdlib/wcstoimax.c
+++ b/src/stdlib/wcstoimax.c
@@ -1,4 +1,5 @@
#include <wchar.h>
+#include <wctype.h>
#include <inttypes.h>
#include <errno.h>
diff --git a/src/stdlib/wcstoumax.c b/src/stdlib/wcstoumax.c
index a8f4680f..456ddedd 100644
--- a/src/stdlib/wcstoumax.c
+++ b/src/stdlib/wcstoumax.c
@@ -1,4 +1,5 @@
#include <wchar.h>
+#include <wctype.h>
#include <stdlib.h>
#include <inttypes.h>
#include <errno.h>