Index: src/OFSeekableStream.h
==================================================================
--- src/OFSeekableStream.h
+++ src/OFSeekableStream.h
@@ -27,11 +27,11 @@
 
 OF_ASSUME_NONNULL_BEGIN
 
 #if defined(OF_WINDOWS)
 typedef __int64 of_offset_t;
-#elif defined(__ANDROID__)
+#elif defined(OF_ANDROID)
 typedef long long of_offset_t;
 #elif defined(OF_MORPHOS) && !defined(OF_IXEMUL)
 typedef signed long long of_offset_t;
 #elif defined(OF_HAVE_OFF64_T)
 typedef off64_t of_offset_t;

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -81,11 +81,11 @@
 
 #ifdef OF_HAVE_ATOMIC_OPS
 # import "atomic.h"
 #endif
 
-#ifdef __DJGPP__
+#ifdef OF_DJGPP
 # define lrint(x) rint(x)
 #endif
 
 #ifdef OF_HAVE_THREADS
 # import "threading.h"

Index: src/platform.h
==================================================================
--- src/platform.h
+++ src/platform.h
@@ -90,10 +90,12 @@
 # define OF_NETBSD
 #elif defined(__OpenBSD__)
 # define OF_OPENBSD
 #elif defined(__DragonFly__)
 # define OF_DRAGONFLYBSD
+#elif defined(__ANDROID__)
+# define OF_ANDROID
 #elif defined(__HAIKU__)
 # define OF_HAIKU
 #elif defined(__MORPHOS__)
 # define OF_MORPHOS
 # ifdef __ixemul__
@@ -106,10 +108,11 @@
 #elif defined(__wii__)
 # define OF_WII
 #elif defined(_PSP)
 # define OF_PSP
 #elif defined(__DJGPP__)
+# define OF_DJGPP
 # define OF_MSDOS
 #endif
 
 #if defined(__ELF__)
 # define OF_ELF

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -656,11 +656,11 @@
 	TEST(@"-[floatValue]",
 	    [C(@"\t-0.25 ") floatValue] == -0.25 &&
 	    [C(@"\r-INFINITY\n") floatValue] == -INFINITY &&
 	    isnan([C(@"   NAN\t\t") floatValue]))
 
-#if !defined(__ANDROID__) && !defined(OF_SOLARIS) && !defined(__DJGPP__)
+#if !defined(OF_ANDROID) && !defined(OF_SOLARIS) && !defined(OF_DJGPP)
 # define INPUT @"\t-0x1.FFFFFFFFFFFFFP-1020 "
 # define EXPECTED -0x1.FFFFFFFFFFFFFP-1020
 #else
 /* Android, Solaris and DJGPP do not accept 0x for strtod() */
 # if !defined(OF_SOLARIS) || !defined(OF_X86)