@@ -15,21 +15,21 @@
  * file.
  */
 
 #import "macros.h"
 
-#if defined(OF_COMPILING_AMIGA_LIBRARY) || defined(OF_COMPILING_AMIGA_LINKLIB)
-# ifdef OF_MORPHOS
-#  include <ppcinline/macros.h>
-#  define OF_M68K_ARG(type, name, reg) type name = (type)REG_##reg;
-# else
-#  define OF_M68K_ARG(type, name, reg)		\
+#ifdef OF_MORPHOS
+# include <ppcinline/macros.h>
+# define OF_M68K_ARG(type, name, reg) type name = (type)REG_##reg;
+#else
+# define OF_M68K_ARG(type, name, reg)		\
 	register type reg_##name __asm__(#reg);	\
 	type name = reg_##name;
-# endif
+#endif
 
 typedef void (*of_sig_t)(int);
+
 struct of_libc {
 	/*
 	 * Needed by the runtime. Some of them are also used by ObjFW, but we
 	 * need all of them to pass them along to the runtime.
 	 */
@@ -39,15 +39,15 @@
 	void (*_Nonnull free)(void *_Nullable);
 	int (*_Nonnull vfprintf)(FILE *_Nonnull restrict,
 	    const char *_Nonnull restrict, va_list);
 	int (*_Nonnull fflush)(FILE *_Nonnull);
 	void (*_Nonnull abort)(void);
-# ifdef HAVE_SJLJ_EXCEPTIONS
+#ifdef HAVE_SJLJ_EXCEPTIONS
 	int (*_Nonnull _Unwind_SjLj_RaiseException)(void *_Nonnull);
-# else
+#else
 	int (*_Nonnull _Unwind_RaiseException)(void *_Nonnull);
-# endif
+#endif
 	void (*_Nonnull _Unwind_DeleteException)(void *_Nonnull);
 	void *_Nullable (*_Nonnull _Unwind_GetLanguageSpecificData)(
 	    void *_Nonnull);
 	uintptr_t (*_Nonnull _Unwind_GetRegionStart)(void *_Nonnull);
 	uintptr_t (*_Nonnull _Unwind_GetDataRelBase)(void *_Nonnull);
@@ -54,34 +54,33 @@
 	uintptr_t (*_Nonnull _Unwind_GetTextRelBase)(void *_Nonnull);
 	uintptr_t (*_Nonnull _Unwind_GetIP)(void *_Nonnull);
 	uintptr_t (*_Nonnull _Unwind_GetGR)(void *_Nonnull, int);
 	void (*_Nonnull _Unwind_SetIP)(void *_Nonnull, uintptr_t);
 	void (*_Nonnull _Unwind_SetGR)(void *_Nonnull, int, uintptr_t);
-# ifdef HAVE_SJLJ_EXCEPTIONS
+#ifdef HAVE_SJLJ_EXCEPTIONS
 	void (*_Nonnull _Unwind_SjLj_Resume)(void *_Nonnull);
-# else
+#else
 	void (*_Nonnull _Unwind_Resume)(void *_Nonnull);
-# endif
-# ifdef OF_AMIGAOS_M68K
+#endif
+#ifdef OF_AMIGAOS_M68K
 	void (*_Nonnull __register_frame_info)(const void *_Nonnull,
 	    void *_Nonnull);
 	void *_Nullable (*_Nonnull __deregister_frame_info)(
 	    const void *_Nonnull);
-# endif
+#endif
 
 	/* Needed only by ObjFW. */
 	int (*_Nonnull vsnprintf)(const char *_Nonnull restrict, size_t,
 	    const char *_Nonnull restrict, va_list);
-# ifdef OF_AMIGAOS_M68K
+#ifdef OF_AMIGAOS_M68K
 	/* strtod() uses sscanf() internally */
 	int (*_Nonnull vsscanf)(const char *_Nonnull restrict,
 	    const char *_Nonnull restrict, va_list);
-# endif
+#endif
 	void (*_Nonnull exit)(int);
+	of_sig_t _Nullable (*_Nonnull signal)(int, of_sig_t _Nullable);
 	char *_Nullable (*_Nonnull setlocale)(int, const char *_Nullable);
 	int (*_Nonnull _Unwind_Backtrace)(int (*_Nonnull)(void *_Nonnull,
 	    void *_Null_unspecified), void *_Null_unspecified);
-	of_sig_t _Nullable (*_Nonnull signal)(int, of_sig_t _Nullable);
 };
 
 extern bool of_init(unsigned int version, struct of_libc *libc, FILE **sF);
-#endif