Ticket #21912: byteswap-osx.patch

kstars/kstars/binfilehelper.cpp

@@ -38 +38 @@
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #else
+#if defined(Q_OS_MAC)
+#include <libkern/OSByteOrder.h>
+#define bswap_16(x) OSSwapInt16(x)
+#define bswap_32(x) OSSwapInt32(x)
+#else
 #include <byteswap.h>
 #endif
 #endif
+#endif
 
 class BinFileHelper;
 

kstars/kstars/skycomponents/starcomponent.cpp

@@ -38 +38 @@
 #include "binfilehelper.h"
 #include "starblockfactory.h"
 
+// Byte-swapping support.
+//
+// bswap_16 is a linuxism, use BSWAP_16 define on Solaris,
+// probably need to usw BSD's swap16() on FreeBSD. This could
+// use some cmake checks to actually check for the supported
+// include files and which form of byte swapping to use.
+//
+#ifdef Q_OS_SOLARIS
+#include <sys/byteorder.h>
+#define bswap_16(x) BSWAP_16(x)
+#define bswap_32(x) BSWAP_32(x)
+#else
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 #include <sys/endian.h>
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #else
+#if defined(Q_OS_MAC)
+#include <libkern/OSByteOrder.h>
+#define bswap_16(x) OSSwapInt16(x)
+#define bswap_32(x) OSSwapInt32(x)
+#else
 #include <byteswap.h>
 #endif
+#endif
+#endif
 
 #include <kde_file.h>
 

kstars/kstars/skycomponents/deepstarcomponent.cpp

@@ -53 +53 @@
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #else
+#if defined(Q_OS_MAC)
+#include <libkern/OSByteOrder.h>
+#define bswap_16(x) OSSwapInt16(x)
+#define bswap_32(x) OSSwapInt32(x)
+#else
 #include <byteswap.h>
 #endif
 #endif
+#endif
 
 DeepStarComponent::DeepStarComponent( SkyComponent *parent, QString fileName, float trigMag, bool staticstars )
     : ListComponent(parent), m_reindexNum( J2000 ), triggerMag( trigMag ), m_FaintMagnitude(-5.0),