Index: src/OFDate.m ================================================================== --- src/OFDate.m +++ src/OFDate.m @@ -368,11 +368,11 @@ double d; uint8_t b[sizeof(double)]; } d; uint8_t i; - d.d = of_bswap_double_if_le(seconds); + d.d = OF_BSWAP_DOUBLE_IF_LE(seconds); OF_HASH_INIT(hash); for (i = 0; i < sizeof(double); i++) OF_HASH_ADD(hash, d.b[i]); Index: src/OFMD5Hash.m ================================================================== --- src/OFMD5Hash.m +++ src/OFMD5Hash.m @@ -31,10 +31,23 @@ #define F4(x, y, z) (y ^ (x | ~z)) /* This is the central step in the MD5 algorithm. */ #define MD5STEP(f, w, x, y, z, data, s) \ (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x) + +#ifdef OF_BIG_ENDIAN +static OF_INLINE void +BSWAP32_VEC_IF_BE(uint32_t *buffer, size_t length) +{ + while (length--) { + *buffer = OF_BSWAP32(*buffer); + buffer++; + } +} +#else +# define BSWAP32_VEC_IF_BE(buffer, length) +#endif static void md5_transform(uint32_t buffer[4], const uint32_t in[16]) { register uint32_t a, b, c, d; @@ -175,21 +188,21 @@ memcpy(p, buffer_, length); return; } memcpy(p, buffer_, t); - of_bswap32_vec_if_be(in.u32, 16); + BSWAP32_VEC_IF_BE(in.u32, 16); md5_transform(buffer, in.u32); buffer_ += t; length -= t; } /* Process data in 64-byte chunks */ while (length >= 64) { memcpy(in.u8, buffer_, 64); - of_bswap32_vec_if_be(in.u32, 16); + BSWAP32_VEC_IF_BE(in.u32, 16); md5_transform(buffer, in.u32); buffer_ += 64; length -= 64; } @@ -221,28 +234,28 @@ /* Pad out to 56 mod 64 */ if (count < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ memset(p, 0, count); - of_bswap32_vec_if_be(in.u32, 16); + BSWAP32_VEC_IF_BE(in.u32, 16); md5_transform(buffer, in.u32); /* Now fill the next block with 56 bytes */ memset(in.u8, 0, 56); } else { /* Pad block to 56 bytes */ memset(p, 0, count - 8); } - of_bswap32_vec_if_be(in.u32, 14); + BSWAP32_VEC_IF_BE(in.u32, 14); /* Append length in bits and transform */ in.u32[14] = bits[0]; in.u32[15] = bits[1]; md5_transform(buffer, in.u32); - of_bswap32_vec_if_be(buffer, 4); + BSWAP32_VEC_IF_BE(buffer, 4); calculated = YES; return (uint8_t*)buffer; } @end Index: src/OFNumber.m ================================================================== --- src/OFNumber.m +++ src/OFNumber.m @@ -1048,11 +1048,11 @@ union { float f; uint8_t b[sizeof(float)]; } f; - f.f = of_bswap_float_if_le(value.float_); + f.f = OF_BSWAP_FLOAT_IF_LE(value.float_); OF_HASH_INIT(hash); for (i = 0; i < sizeof(float); i++) OF_HASH_ADD(hash, f.b[i]); @@ -1064,11 +1064,11 @@ union { double d; uint8_t b[sizeof(double)]; } d; - d.d = of_bswap_double_if_le(value.double_); + d.d = OF_BSWAP_DOUBLE_IF_LE(value.double_); OF_HASH_INIT(hash); for (i = 0; i < sizeof(double); i++) OF_HASH_ADD(hash, d.b[i]); Index: src/OFStream.m ================================================================== --- src/OFStream.m +++ src/OFStream.m @@ -205,51 +205,51 @@ uint16_t ret; [self readIntoBuffer: (char*)&ret exactLength: 2]; - return of_bswap16_if_le(ret); + return OF_BSWAP16_IF_LE(ret); } - (uint32_t)readBigEndianInt32 { uint32_t ret; [self readIntoBuffer: (char*)&ret exactLength: 4]; - return of_bswap32_if_le(ret); + return OF_BSWAP32_IF_LE(ret); } - (uint64_t)readBigEndianInt64 { uint64_t ret; [self readIntoBuffer: (char*)&ret exactLength: 8]; - return of_bswap64_if_le(ret); + return OF_BSWAP64_IF_LE(ret); } - (float)readBigEndianFloat { float ret; [self readIntoBuffer: (char*)&ret exactLength: 4]; - return of_bswap_float_if_le(ret); + return OF_BSWAP_FLOAT_IF_LE(ret); } - (double)readBigEndianDouble { double ret; [self readIntoBuffer: (char*)&ret exactLength: 8]; - return of_bswap_double_if_le(ret); + return OF_BSWAP_DOUBLE_IF_LE(ret); } - (size_t)readBigEndianInt16sIntoBuffer: (uint16_t*)buffer count: (size_t)nInt16s { @@ -260,11 +260,11 @@ #ifndef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt16s; i++) - buffer[i] = of_bswap16(buffer[i]); + buffer[i] = OF_BSWAP16(buffer[i]); #endif return size; } @@ -278,11 +278,11 @@ #ifndef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt32s; i++) - buffer[i] = of_bswap32(buffer[i]); + buffer[i] = OF_BSWAP32(buffer[i]); #endif return size; } @@ -296,11 +296,11 @@ #ifndef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt64s; i++) - buffer[i] = of_bswap64(buffer[i]); + buffer[i] = OF_BSWAP64(buffer[i]); #endif return size; } @@ -314,11 +314,11 @@ #ifndef OF_FLOAT_BIG_ENDIAN size_t i; for (i = 0; i < nFloats; i++) - buffer[i] = of_bswap_float(buffer[i]); + buffer[i] = OF_BSWAP_FLOAT(buffer[i]); #endif return size; } @@ -332,11 +332,11 @@ #ifndef OF_FLOAT_BIG_ENDIAN size_t i; for (i = 0; i < nDoubles; i++) - buffer[i] = of_bswap_double(buffer[i]); + buffer[i] = OF_BSWAP_DOUBLE(buffer[i]); #endif return size; } @@ -345,51 +345,51 @@ uint16_t ret; [self readIntoBuffer: (char*)&ret exactLength: 2]; - return of_bswap16_if_be(ret); + return OF_BSWAP16_IF_BE(ret); } - (uint32_t)readLittleEndianInt32 { uint32_t ret; [self readIntoBuffer: (char*)&ret exactLength: 4]; - return of_bswap32_if_be(ret); + return OF_BSWAP32_IF_BE(ret); } - (uint64_t)readLittleEndianInt64 { uint64_t ret; [self readIntoBuffer: (char*)&ret exactLength: 8]; - return of_bswap64_if_be(ret); + return OF_BSWAP64_IF_BE(ret); } - (float)readLittleEndianFloat { float ret; [self readIntoBuffer: (char*)&ret exactLength: 4]; - return of_bswap_float_if_be(ret); + return OF_BSWAP_FLOAT_IF_BE(ret); } - (double)readLittleEndianDouble { double ret; [self readIntoBuffer: (char*)&ret exactLength: 8]; - return of_bswap_double_if_be(ret); + return OF_BSWAP_DOUBLE_IF_BE(ret); } - (size_t)readLittleEndianInt16sIntoBuffer: (uint16_t*)buffer count: (size_t)nInt16s { @@ -400,11 +400,11 @@ #ifdef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt16s; i++) - buffer[i] = of_bswap16(buffer[i]); + buffer[i] = OF_BSWAP16(buffer[i]); #endif return size; } @@ -418,11 +418,11 @@ #ifdef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt32s; i++) - buffer[i] = of_bswap32(buffer[i]); + buffer[i] = OF_BSWAP32(buffer[i]); #endif return size; } @@ -436,11 +436,11 @@ #ifdef OF_BIG_ENDIAN size_t i; for (i = 0; i < nInt64s; i++) - buffer[i] = of_bswap64(buffer[i]); + buffer[i] = OF_BSWAP64(buffer[i]); #endif return size; } @@ -454,11 +454,11 @@ #ifdef OF_FLOAT_BIG_ENDIAN size_t i; for (i = 0; i < nFloats; i++) - buffer[i] = of_bswap_float(buffer[i]); + buffer[i] = OF_BSWAP_FLOAT(buffer[i]); #endif return size; } @@ -472,11 +472,11 @@ #ifdef OF_FLOAT_BIG_ENDIAN size_t i; for (i = 0; i < nDoubles; i++) - buffer[i] = of_bswap_double(buffer[i]); + buffer[i] = OF_BSWAP_DOUBLE(buffer[i]); #endif return size; } @@ -973,43 +973,43 @@ length: 1]; } - (void)writeBigEndianInt16: (uint16_t)int16 { - int16 = of_bswap16_if_le(int16); + int16 = OF_BSWAP16_IF_LE(int16); [self writeBuffer: (char*)&int16 length: 2]; } - (void)writeBigEndianInt32: (uint32_t)int32 { - int32 = of_bswap32_if_le(int32); + int32 = OF_BSWAP32_IF_LE(int32); [self writeBuffer: (char*)&int32 length: 4]; } - (void)writeBigEndianInt64: (uint64_t)int64 { - int64 = of_bswap64_if_le(int64); + int64 = OF_BSWAP64_IF_LE(int64); [self writeBuffer: (char*)&int64 length: 8]; } - (void)writeBigEndianFloat: (float)float_ { - float_ = of_bswap_float_if_le(float_); + float_ = OF_BSWAP_FLOAT_IF_LE(float_); [self writeBuffer: (char*)&float_ length: 4]; } - (void)writeBigEndianDouble: (double)double_ { - double_ = of_bswap_double_if_le(double_); + double_ = OF_BSWAP_DOUBLE_IF_LE(double_); [self writeBuffer: (char*)&double_ length: 8]; } @@ -1029,11 +1029,11 @@ @try { size_t i; for (i = 0; i < nInt16s; i++) - tmp[i] = of_bswap16(buffer[i]); + tmp[i] = OF_BSWAP16(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1059,11 +1059,11 @@ @try { size_t i; for (i = 0; i < nInt32s; i++) - tmp[i] = of_bswap32(buffer[i]); + tmp[i] = OF_BSWAP32(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1089,11 +1089,11 @@ @try { size_t i; for (i = 0; i < nInt64s; i++) - tmp[i] = of_bswap64(buffer[i]); + tmp[i] = OF_BSWAP64(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1119,11 +1119,11 @@ @try { size_t i; for (i = 0; i < nFloats; i++) - tmp[i] = of_bswap_float(buffer[i]); + tmp[i] = OF_BSWAP_FLOAT(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1149,11 +1149,11 @@ @try { size_t i; for (i = 0; i < nDoubles; i++) - tmp[i] = of_bswap_double(buffer[i]); + tmp[i] = OF_BSWAP_DOUBLE(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1163,43 +1163,43 @@ return size; } - (void)writeLittleEndianInt16: (uint16_t)int16 { - int16 = of_bswap16_if_be(int16); + int16 = OF_BSWAP16_IF_BE(int16); [self writeBuffer: (char*)&int16 length: 2]; } - (void)writeLittleEndianInt32: (uint32_t)int32 { - int32 = of_bswap32_if_be(int32); + int32 = OF_BSWAP32_IF_BE(int32); [self writeBuffer: (char*)&int32 length: 4]; } - (void)writeLittleEndianInt64: (uint64_t)int64 { - int64 = of_bswap64_if_be(int64); + int64 = OF_BSWAP64_IF_BE(int64); [self writeBuffer: (char*)&int64 length: 8]; } - (void)writeLittleEndianFloat: (float)float_ { - float_ = of_bswap_float_if_be(float_); + float_ = OF_BSWAP_FLOAT_IF_BE(float_); [self writeBuffer: (char*)&float_ length: 4]; } - (void)writeLittleEndianDouble: (double)double_ { - double_ = of_bswap_double_if_be(double_); + double_ = OF_BSWAP_DOUBLE_IF_BE(double_); [self writeBuffer: (char*)&double_ length: 8]; } @@ -1219,11 +1219,11 @@ @try { size_t i; for (i = 0; i < nInt16s; i++) - tmp[i] = of_bswap16(buffer[i]); + tmp[i] = OF_BSWAP16(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1249,11 +1249,11 @@ @try { size_t i; for (i = 0; i < nInt32s; i++) - tmp[i] = of_bswap32(buffer[i]); + tmp[i] = OF_BSWAP32(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1279,11 +1279,11 @@ @try { size_t i; for (i = 0; i < nInt64s; i++) - tmp[i] = of_bswap64(buffer[i]); + tmp[i] = OF_BSWAP64(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1309,11 +1309,11 @@ @try { size_t i; for (i = 0; i < nFloats; i++) - tmp[i] = of_bswap_float(buffer[i]); + tmp[i] = OF_BSWAP_FLOAT(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; @@ -1339,11 +1339,11 @@ @try { size_t i; for (i = 0; i < nDoubles; i++) - tmp[i] = of_bswap_double(buffer[i]); + tmp[i] = OF_BSWAP_DOUBLE(buffer[i]); [self writeBuffer: tmp length: size]; } @finally { [self freeMemory: tmp]; Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -1851,14 +1851,14 @@ @throw [OFInvalidEncodingException exceptionWithClass: [self class]]; if (c > 0xFFFF) { c -= 0x10000; - ret[j++] = of_bswap16_if_le(0xD800 | (c >> 10)); - ret[j++] = of_bswap16_if_le(0xDC00 | (c & 0x3FF)); + ret[j++] = OF_BSWAP16_IF_LE(0xD800 | (c >> 10)); + ret[j++] = OF_BSWAP16_IF_LE(0xDC00 | (c & 0x3FF)); } else - ret[j++] = of_bswap16_if_le(c); + ret[j++] = OF_BSWAP16_IF_LE(c); } ret[j] = 0; @try { Index: src/OFString_UTF8.m ================================================================== --- src/OFString_UTF8.m +++ src/OFString_UTF8.m @@ -497,11 +497,11 @@ s->length = length; for (i = 0; i < length; i++) { char buffer[4]; size_t characterLen = of_string_utf8_encode( - (swap ? of_bswap32(string[i]) : string[i]), + (swap ? OF_BSWAP32(string[i]) : string[i]), buffer); switch (characterLen) { case 1: s->cString[j++] = buffer[0]; @@ -579,11 +579,11 @@ s->length = length; for (i = 0; i < length; i++) { char buffer[4]; of_unichar_t character = - (swap ? of_bswap16(string[i]) : string[i]); + (swap ? OF_BSWAP16(string[i]) : string[i]); size_t characterLen; /* Missing high surrogate */ if ((character & 0xFC00) == 0xDC00) @throw [OFInvalidEncodingException @@ -595,11 +595,11 @@ if (length <= i + 1) @throw [OFInvalidEncodingException exceptionWithClass: [self class]]; nextCharacter = (swap - ? of_bswap16(string[i + 1]) + ? OF_BSWAP16(string[i + 1]) : string[i + 1]); character = (((character & 0x3FF) << 10) | (nextCharacter & 0x3FF)) + 0x10000; i++; Index: src/OFTCPSocket.m ================================================================== --- src/OFTCPSocket.m +++ src/OFTCPSocket.m @@ -350,11 +350,11 @@ host: host]; } memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = of_bswap16_if_le(port); + addr.sin_port = OF_BSWAP16_IF_LE(port); if (he->h_addrtype != AF_INET || (sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { # ifdef OF_THREADS [addrlist release]; @@ -523,11 +523,11 @@ host: host]; } memset(&addr, 0, sizeof(addr)); addr.in.sin_family = AF_INET; - addr.in.sin_port = of_bswap16_if_le(port); + addr.in.sin_port = OF_BSWAP16_IF_LE(port); if (he->h_addrtype != AF_INET || he->h_addr_list[0] == NULL) { # ifdef OF_THREADS [mutex unlock]; # endif @@ -570,13 +570,13 @@ host: host port: port]; } if (addr.storage.ss_family == AF_INET) - return of_bswap16_if_le(addr.in.sin_port); + return OF_BSWAP16_IF_LE(addr.in.sin_port); if (addr.storage.ss_family == AF_INET6) - return of_bswap16_if_le(addr.in6.sin6_port); + return OF_BSWAP16_IF_LE(addr.in6.sin6_port); close(sock); sock = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithClass: [self class] socket: self Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -137,27 +137,27 @@ return objc_getProperty(self, _cmd, OF_IVAR_OFFSET(ivar), atomic); #define OF_SETTER(ivar, value, atomic, copy) \ objc_setProperty(self, _cmd, OF_IVAR_OFFSET(ivar), value, atomic, copy); static OF_INLINE uint16_t OF_CONST_FUNC -of_bswap16_const(uint16_t i) +OF_BSWAP16_CONST(uint16_t i) { return (i & UINT16_C(0xFF00)) >> 8 | (i & UINT16_C(0x00FF)) << 8; } static OF_INLINE uint32_t OF_CONST_FUNC -of_bswap32_const(uint32_t i) +OF_BSWAP32_CONST(uint32_t i) { return (i & UINT32_C(0xFF000000)) >> 24 | (i & UINT32_C(0x00FF0000)) >> 8 | (i & UINT32_C(0x0000FF00)) << 8 | (i & UINT32_C(0x000000FF)) << 24; } static OF_INLINE uint64_t OF_CONST_FUNC -of_bswap64_const(uint64_t i) +OF_BSWAP64_CONST(uint64_t i) { return (i & UINT64_C(0xFF00000000000000)) >> 56 | (i & UINT64_C(0x00FF000000000000)) >> 40 | (i & UINT64_C(0x0000FF0000000000)) >> 24 | (i & UINT64_C(0x000000FF00000000)) >> 8 | @@ -166,11 +166,11 @@ (i & UINT64_C(0x000000000000FF00)) << 40 | (i & UINT64_C(0x00000000000000FF)) << 56; } static OF_INLINE uint16_t OF_CONST_FUNC -of_bswap16_nonconst(uint16_t i) +OF_BSWAP16_NONCONST(uint16_t i) { #if defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "xchgb %h0, %b0" : "=Q"(i) @@ -194,11 +194,11 @@ #endif return i; } static OF_INLINE uint32_t OF_CONST_FUNC -of_bswap32_nonconst(uint32_t i) +OF_BSWAP32_NONCONST(uint32_t i) { #if defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "bswap %0" : "=q"(i) @@ -224,11 +224,11 @@ #endif return i; } static OF_INLINE uint64_t OF_CONST_FUNC -of_bswap64_nonconst(uint64_t i) +OF_BSWAP64_NONCONST(uint64_t i) { #if defined(OF_AMD64_ASM) __asm__ ( "bswap %0" : "=r"(i) @@ -241,94 +241,83 @@ "xchgl %%eax, %%edx" : "=A"(i) : "0"(i) ); #else - i = (uint64_t)of_bswap32_nonconst((uint32_t)(i & 0xFFFFFFFF)) << 32 | - of_bswap32_nonconst((uint32_t)(i >> 32)); + i = (uint64_t)OF_BSWAP32_NONCONST((uint32_t)(i & 0xFFFFFFFF)) << 32 | + OF_BSWAP32_NONCONST((uint32_t)(i >> 32)); #endif return i; } #ifdef __GNUC__ -# define of_bswap16(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)) -# define of_bswap64(i) \ - (__builtin_constant_p(i) ? of_bswap64_const(i) : of_bswap64_nonconst(i)) +# define OF_BSWAP16(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)) +# define OF_BSWAP64(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) +# 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 static OF_INLINE float OF_CONST_FUNC -of_bswap_float(float f) +OF_BSWAP_FLOAT(float f) { union { float f; uint32_t i; } u; u.f = f; - u.i = of_bswap32(u.i); + u.i = OF_BSWAP32(u.i); return u.f; } static OF_INLINE double OF_CONST_FUNC -of_bswap_double(double d) +OF_BSWAP_DOUBLE(double d) { union { double d; uint64_t i; } u; u.d = d; - u.i = of_bswap64(u.i); + u.i = OF_BSWAP64(u.i); return u.d; } -static OF_INLINE void -of_bswap32_vec(uint32_t *buffer, size_t length) -{ - while (length--) { - *buffer = of_bswap32(*buffer); - buffer++; - } -} - #ifdef OF_BIG_ENDIAN -# define of_bswap16_if_be(i) of_bswap16(i) -# define of_bswap32_if_be(i) of_bswap32(i) -# define of_bswap64_if_be(i) of_bswap64(i) -# define of_bswap16_if_le(i) (i) -# define of_bswap32_if_le(i) (i) -# define of_bswap64_if_le(i) (i) -# define of_bswap32_vec_if_be(buffer, length) of_bswap32_vec(buffer, length) +# define OF_BSWAP16_IF_BE(i) OF_BSWAP16(i) +# define OF_BSWAP32_IF_BE(i) OF_BSWAP32(i) +# define OF_BSWAP64_IF_BE(i) OF_BSWAP64(i) +# define OF_BSWAP16_IF_LE(i) (i) +# define OF_BSWAP32_IF_LE(i) (i) +# define OF_BSWAP64_IF_LE(i) (i) #else -# define of_bswap16_if_be(i) (i) -# define of_bswap32_if_be(i) (i) -# define of_bswap64_if_be(i) (i) -# define of_bswap16_if_le(i) of_bswap16(i) -# define of_bswap32_if_le(i) of_bswap32(i) -# define of_bswap64_if_le(i) of_bswap64(i) -# define of_bswap32_vec_if_be(buffer, length) +# define OF_BSWAP16_IF_BE(i) (i) +# define OF_BSWAP32_IF_BE(i) (i) +# define OF_BSWAP64_IF_BE(i) (i) +# define OF_BSWAP16_IF_LE(i) OF_BSWAP16(i) +# define OF_BSWAP32_IF_LE(i) OF_BSWAP32(i) +# define OF_BSWAP64_IF_LE(i) OF_BSWAP64(i) #endif #ifdef OF_FLOAT_BIG_ENDIAN -# define of_bswap_float_if_be(i) of_bswap_float(i) -# define of_bswap_double_if_be(i) of_bswap_double(i) -# define of_bswap_float_if_le(i) (i) -# define of_bswap_double_if_le(i) (i) +# define OF_BSWAP_FLOAT_IF_BE(i) OF_BSWAP_FLOAT(i) +# define OF_BSWAP_DOUBLE_IF_BE(i) OF_BSWAP_DOUBLE(i) +# define OF_BSWAP_FLOAT_IF_LE(i) (i) +# define OF_BSWAP_DOUBLE_IF_LE(i) (i) #else -# define of_bswap_float_if_be(i) (i) -# 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) +# define OF_BSWAP_FLOAT_IF_BE(i) (i) +# 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 /* * We define it here and not in objfw-defs.h, as it would be theoretically * possible to build a universal binary for Mac OS X and iOS.