Index: src/OFCondition.m
==================================================================
--- src/OFCondition.m
+++ src/OFCondition.m
@@ -104,11 +104,11 @@
 
 #ifdef OF_AMIGAOS
 - (bool)waitForTimeInterval: (OFTimeInterval)timeInterval
 	       orExecSignal: (ULONG *)signalMask
 {
-	int error = OFPlainConditionTimedWaitExecOrSignal(&_condition, &_mutex,
+	int error = OFPlainConditionTimedWaitOrExecSignal(&_condition, &_mutex,
 	    timeInterval, signalMask);
 
 	if (error == ETIMEDOUT)
 		return false;
 

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -77,11 +77,11 @@
 #endif
 
 #ifndef OF_AMIGAOS
 # define closeHandle(h) close(h)
 #else
-static struct _OFFileHandle
+static struct _OFFileHandle {
 	struct _OFFileHandle *previous, *next;
 	BPTR handle;
 	bool append;
 } *firstHandle = NULL;
 

Index: src/OFLocale.m
==================================================================
--- src/OFLocale.m
+++ src/OFLocale.m
@@ -424,11 +424,11 @@
 		if (0) {
 # endif
 			OFStringEncoding ASCII = OFStringEncodingASCII;
 
 			@try {
-				_encoding = OFStringEncodingForName(
+				_encoding = OFStringEncodingParseName(
 				    [OFString stringWithCString: buffer
 						       encoding: ASCII]);
 			} @catch (OFInvalidArgumentException *e) {
 				_encoding = OFStringEncodingISO8859_1;
 			}

Index: src/OFPlainThread.h
==================================================================
--- src/OFPlainThread.h
+++ src/OFPlainThread.h
@@ -73,16 +73,11 @@
 {
 	return (thread == GetCurrentThread());
 }
 #elif defined(OF_AMIGAOS)
 extern OFPlainThread OFCurrentPlainThread(void);
-
-static OF_INLINE bool
-OFPlainThreadIsCurrent(OFPlainThread thread)
-{
-	return (thread->thread == FindTask(NULL));
-}
+extern bool OFPlainThreadIsCurrent(OFPlainThread);
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: src/macros.h
==================================================================
--- src/macros.h
+++ src/macros.h
@@ -607,15 +607,15 @@
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 # define OFFromBigEndianFloat(f) (f)
 # define OFFromBigEndianDouble(d) (d)
 # define OFFromLittleEndianFloat(f) OFByteSwapFloat(f)
-# define OFFromLittleEndianDouble(i) OFByteSwapDouble(d)
+# define OFFromLittleEndianDouble(d) OFByteSwapDouble(d)
 # define OFToBigEndianFloat(f) (f)
 # define OFToBigEndianDouble(d) (d)
 # define OFToLittleEndianFloat(f) OFByteSwapFloat(f)
-# define OFToLittleEndianDouble(i) OFByteSwapDouble(d)
+# define OFToLittleEndianDouble(d) OFByteSwapDouble(d)
 #else
 # define OFFromBigEndianFloat(f) OFByteSwapFloat(f)
 # define OFFromBigEndianDouble(d) OFByteSwapDouble(d)
 # define OFFromLittleEndianFloat(f) (f)
 # define OFFromLittleEndianDouble(d) (d)

Index: src/platform/amiga/OFPlainThread.m
==================================================================
--- src/platform/amiga/OFPlainThread.m
+++ src/platform/amiga/OFPlainThread.m
@@ -157,10 +157,16 @@
 OFPlainThread
 OFCurrentPlainThread(void)
 {
 	return OFTLSKeyGet(threadKey);
 }
+
+bool
+OFPlainThreadIsCurrent(OFPlainThread thread)
+{
+	return (thread->task == FindTask(NULL));
+}
 
 int
 OFPlainThreadJoin(OFPlainThread thread)
 {
 	ObtainSemaphore(&thread->semaphore);