Index: src/OFObject.m ================================================================== --- src/OFObject.m +++ src/OFObject.m @@ -79,15 +79,15 @@ struct pre_mem *prev, *next; id owner; }; #define PRE_IVARS_ALIGN ((sizeof(struct pre_ivar) + \ - (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1)) + (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1)) #define PRE_IVARS ((struct pre_ivar*)(void*)((char*)self - PRE_IVARS_ALIGN)) #define PRE_MEM_ALIGN ((sizeof(struct pre_mem) + \ - (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1)) + (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1)) #define PRE_MEM(mem) ((struct pre_mem*)(void*)((char*)mem - PRE_MEM_ALIGN)) static struct { Class isa; } allocFailedException; Index: src/block.h ================================================================== --- src/block.h +++ src/block.h @@ -45,12 +45,12 @@ } #endif #ifndef Block_copy # define Block_copy(...) \ - ((__typeof__(__VA_ARGS__))_Block_copy((const void*)(__VA_ARGS__))) + ((__typeof__(__VA_ARGS__))_Block_copy((const void*)(__VA_ARGS__))) #endif #ifndef Block_release # define Block_release(...) _Block_release((const void*)(__VA_ARGS__)) #endif OF_ASSUME_NONNULL_END Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -132,11 +132,11 @@ #if __has_feature(objc_arc) # define OF_RETURNS_RETAINED __attribute__((__ns_returns_retained__)) # define OF_RETURNS_NOT_RETAINED __attribute__((__ns_returns_not_retained__)) # define OF_RETURNS_INNER_POINTER \ - __attribute__((__objc_returns_inner_pointer__)) + __attribute__((__objc_returns_inner_pointer__)) # define OF_CONSUMED __attribute__((__ns_consumed__)) # define OF_WEAK_UNAVAILABLE __attribute__((__objc_arc_weak_unavailable__)) #else # define OF_RETURNS_RETAINED # define OF_RETURNS_NOT_RETAINED @@ -209,11 +209,11 @@ # define OF_ROOT_CLASS #endif #if __has_attribute(__objc_subclassing_restricted__) # define OF_SUBCLASSING_RESTRICTED \ - __attribute__((__objc_subclassing_restricted__)) + __attribute__((__objc_subclassing_restricted__)) #else # define OF_SUBCLASSING_RESTRICTED #endif #ifdef __GNUC__ @@ -243,19 +243,19 @@ # endif #endif #ifdef OF_APPLE_RUNTIME # if defined(OF_X86_64) || defined(OF_X86) || defined(OF_ARM64) || \ - defined(OF_ARM) || defined(OF_POWERPC) + defined(OF_ARM) || defined(OF_POWERPC) # define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR # define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET # endif #else # if defined(OF_ELF) # if defined(OF_X86_64) || defined(OF_X86) || \ - defined(OF_ARM64) || defined(OF_ARM) || defined(OF_POWERPC) || \ - defined(OF_MIPS) + defined(OF_ARM64) || defined(OF_ARM) || defined(OF_POWERPC) || \ + defined(OF_MIPS) # define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR # if __OBJFW_RUNTIME_ABI__ >= 800 # define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET # endif # endif @@ -431,15 +431,15 @@ return i; } #ifdef __GNUC__ # define OF_BSWAP16(i) \ - (__builtin_constant_p(i) ? OF_BSWAP16_CONST(i) : OF_BSWAP16_NONCONST(i)) + (__builtin_constant_p(i) ? OF_BSWAP16_CONST(i) : OF_BSWAP16_NONCONST(i)) # define OF_BSWAP32(i) \ - (__builtin_constant_p(i) ? OF_BSWAP32_CONST(i) : OF_BSWAP32_NONCONST(i)) + (__builtin_constant_p(i) ? OF_BSWAP32_CONST(i) : OF_BSWAP32_NONCONST(i)) # define OF_BSWAP64(i) \ - (__builtin_constant_p(i) ? OF_BSWAP64_CONST(i) : OF_BSWAP64_NONCONST(i)) + (__builtin_constant_p(i) ? OF_BSWAP64_CONST(i) : OF_BSWAP64_NONCONST(i)) #else # define OF_BSWAP16(i) OF_BSWAP16_CONST(i) # define OF_BSWAP32(i) OF_BSWAP32_CONST(i) # define OF_BSWAP64(i) OF_BSWAP64_CONST(i) #endif @@ -498,20 +498,20 @@ # define OF_BSWAP_DOUBLE_IF_BE(i) (i) # define OF_BSWAP_FLOAT_IF_LE(i) OF_BSWAP_FLOAT(i) # define OF_BSWAP_DOUBLE_IF_LE(i) OF_BSWAP_DOUBLE(i) #endif -#define OF_ROL(value, bits) \ - (((bits) % (sizeof(value) * 8)) > 0 \ - ? ((value) << ((bits) % (sizeof(value) * 8))) | \ - ((value) >> (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \ - : (value)) -#define OF_ROR(value, bits) \ - (((bits) % (sizeof(value) * 8)) > 0 \ - ? ((value) >> ((bits) % (sizeof(value) * 8))) | \ - ((value) << (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \ - : (value)) +#define OF_ROL(value, bits) \ + (((bits) % (sizeof(value) * 8)) > 0 \ + ? ((value) << ((bits) % (sizeof(value) * 8))) | \ + ((value) >> (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \ + : (value)) +#define OF_ROR(value, bits) \ + (((bits) % (sizeof(value) * 8)) > 0 \ + ? ((value) >> ((bits) % (sizeof(value) * 8))) | \ + ((value) << (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \ + : (value)) #define OF_ROUND_UP_POW2(pow2, value) (((value) + (pow2) - 1) & ~((pow2) - 1)) #define OF_HASH_INIT(hash) hash = of_hash_seed; #define OF_HASH_ADD(hash, byte) \ Index: src/platform.h ================================================================== --- src/platform.h +++ src/platform.h @@ -37,18 +37,18 @@ #elif defined(__arm64__) || defined(__aarch64__) || defined(__ARM64_ARCH_8__) # define OF_ARM64 #elif defined(__arm__) || defined(__ARM__) # define OF_ARM # if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_7EM__) + defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ + defined(__ARM_ARCH_7EM__) # define OF_ARMV7 # endif # if defined(OF_ARMV7) || defined(__ARM_ARCH_6__) || \ - defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || \ - defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \ - defined(__ARM_ARCH_6T2__) + defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || \ + defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \ + defined(__ARM_ARCH_6T2__) # define OF_ARMV6 # endif #elif defined(_MIPS_SIM) # if _MIPS_SIM == _ABI64 # define OF_MIPS64 Index: src/runtime/runtime-private.h ================================================================== --- src/runtime/runtime-private.h +++ src/runtime/runtime-private.h @@ -184,13 +184,13 @@ #endif } #if defined(OF_ELF) # if defined(OF_X86_64) || defined(OF_X86) || defined(OF_POWERPC) || \ - defined(OF_ARM64) || defined(OF_ARM) || \ - defined(OF_MIPS64_N64) || defined(OF_MIPS) || \ - defined(OF_SPARC64) || defined(OF_SPARC) + defined(OF_ARM64) || defined(OF_ARM) || \ + defined(OF_MIPS64_N64) || defined(OF_MIPS) || \ + defined(OF_SPARC64) || defined(OF_SPARC) # define OF_ASM_LOOKUP # endif #elif defined(OF_MACH_O) # if defined(OF_X86_64) || defined(OF_POWERPC) # define OF_ASM_LOOKUP Index: src/socket_helpers.h ================================================================== --- src/socket_helpers.h +++ src/socket_helpers.h @@ -75,15 +75,15 @@ # define hstrerror(err) "unknown (no hstrerror)" # define listen(sock, backlog) net_listen(sock, backlog) # define poll(fds, nfds, timeout) net_poll(fds, nfds, timeout) # define recv(sock, buf, len, flags) net_recv(sock, buf, len, flags) # define recvfrom(sock, buf, len, flags, addr, addrlen) \ - net_recvfrom(sock, buf, len, flags, addr, addrlen) + net_recvfrom(sock, buf, len, flags, addr, addrlen) # define send(sock, buf, len, flags) net_send(sock, buf, len, flags) # define sendto(sock, buf, len, flags, addr, addrlen) \ - net_sendto(sock, buf, len, flags, addr, addrlen) + net_sendto(sock, buf, len, flags, addr, addrlen) # define setsockopt(sock, level, name, value, len) \ - net_setsockopt(sock, level, name, value, len) + net_setsockopt(sock, level, name, value, len) # define socket(domain, type, proto) net_socket(domain, type, proto) typedef u32 in_addr_t; typedef u32 nfds_t; #endif Index: src/threading.h ================================================================== --- src/threading.h +++ src/threading.h @@ -17,11 +17,11 @@ #include "objfw-defs.h" #include "platform.h" #if !defined(OF_HAVE_THREADS) || \ - (!defined(OF_HAVE_PTHREADS) && !defined(OF_WINDOWS)) + (!defined(OF_HAVE_PTHREADS) && !defined(OF_WINDOWS)) # error No threads available! #endif #include