$OpenBSD$ --- doomsday/libdeng2/include/de/data/byteorder.h.orig Wed Dec 26 09:11:01 2012 +++ doomsday/libdeng2/include/de/data/byteorder.h Wed Dec 26 09:33:39 2012 @@ -154,18 +154,18 @@ class DENG2_PUBLIC LittleEndianByteOrder : public Byte }; // Swaps the bytes of a 16-bit unsigned integer. -inline duint16 swap16(duint16 const &n) { +inline duint16 duswap16(duint16 const &n) { return ((n & 0xff) << 8) | ((n & 0xff00) >> 8); } /// Swaps the bytes of a 32-bit unsigned integer. -inline duint32 swap32(duint32 const &n) { +inline duint32 duswap32(duint32 const &n) { return ( ((n & 0xff) << 24) | ((n & 0xff00) << 8) | ((n & 0xff0000) >> 8) | ((n & 0xff000000) >> 24)); } /// Swaps the bytes in a 64-bit unsigned integer. -duint64 swap64(duint64 const &n); +duint64 duswap64(duint64 const &n); /// Globally available big-endian byte order converter. DENG2_PUBLIC extern BigEndianByteOrder bigEndianByteOrder;