Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -73,13 +73,10 @@
 #endif
 
 #ifdef OF_AMIGAOS_M68K
 /* libnix has strtod, but not strtof */
 # define strtof strtod
-/* libnix has strtoimax/strtoumax, but not strtoll/strtoull */
-# define strtoll strtoimax
-# define strtoull strtoumax
 #endif
 
 static struct {
 	Class isa;
 } placeholder;

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -1112,11 +1112,11 @@
 # if (!defined(OF_SOLARIS) || !defined(OF_X86)) && !defined(OF_AMIGAOS_M68K)
 #  define INPUT @"\t-0.123456789 "
 #  define EXPECTED -0.123456789
 # else
 /*
- * Solaris' strtod() has weird rounding on x86, but not on x86_64/
+ * Solaris' strtod() has weird rounding on x86, but not on x86_64.
  * AmigaOS 3 with libnix has weird rounding as well.
  */
 #  define INPUT @"\t-0.125 "
 #  define EXPECTED -0.125
 # endif