4 files changed, 20 insertions, 8 deletions
diff --git a/src/stdlib/strtoul.c b/src/stdlib/strtoul.c
index 951d5e8c..20d8bfb2 100644
--- a/src/stdlib/strtoul.c
+++ b/src/stdlib/strtoul.c
@@ -5,8 +5,11 @@
 
 unsigned long strtoul(const char *s, char **p, int base)
 {
-	uintmax_t x = strtoumax(s, p, base);
-	if (x > ULONG_MAX) {
+	intmax_t x;
+	if (sizeof(intmax_t) == sizeof(long))
+		return strtoumax(s, p, base);
+	x = strtoimax(s, p, base);
+	if (-x > ULONG_MAX || x > ULONG_MAX) {
 		errno = ERANGE;
 		return ULONG_MAX;
 	}
diff --git a/src/stdlib/strtoull.c b/src/stdlib/strtoull.c
index 20aa7bde..5d1c4ee5 100644
--- a/src/stdlib/strtoull.c
+++ b/src/stdlib/strtoull.c
@@ -5,8 +5,11 @@
 
 unsigned long long strtoull(const char *s, char **p, int base)
 {
-	uintmax_t x = strtoumax(s, p, base);
-	if (x > ULLONG_MAX) {
+	intmax_t x;
+	if (sizeof(intmax_t) == sizeof(long long))
+		return strtoumax(s, p, base);
+	x = strtoimax(s, p, base);
+	if (-x > ULLONG_MAX || x > ULLONG_MAX) {
 		errno = ERANGE;
 		return ULLONG_MAX;
 	}
diff --git a/src/stdlib/wcstoul.c b/src/stdlib/wcstoul.c
index e39faafe..9cbec1a8 100644
--- a/src/stdlib/wcstoul.c
+++ b/src/stdlib/wcstoul.c
@@ -6,8 +6,11 @@
 
 unsigned long wcstoul(const wchar_t *s, wchar_t **p, int base)
 {
-	uintmax_t x = wcstoumax(s, p, base);
-	if (x > ULONG_MAX) {
+ 	intmax_t x;
+	if (sizeof(intmax_t) == sizeof(long))
+		return wcstoumax(s, p, base);
+	x = wcstoimax(s, p, base);
+	if (-x > ULONG_MAX || x > ULONG_MAX) {
 		errno = ERANGE;
 		return ULONG_MAX;
 	}
diff --git a/src/stdlib/wcstoull.c b/src/stdlib/wcstoull.c
index e324dfb2..48c557db 100644
--- a/src/stdlib/wcstoull.c
+++ b/src/stdlib/wcstoull.c
@@ -6,8 +6,11 @@
 
 unsigned long long wcstoull(const wchar_t *s, wchar_t **p, int base)
 {
-	uintmax_t x = wcstoumax(s, p, base);
-	if (x > ULLONG_MAX) {
+ 	intmax_t x;
+	if (sizeof(intmax_t) == sizeof(long long))
+		return wcstoumax(s, p, base);
+	x = wcstoimax(s, p, base);
+	if (-x > ULLONG_MAX || x > ULLONG_MAX) {
 		errno = ERANGE;
 		return ULLONG_MAX;
 	}