Use system defines for Apple and Windows

Author: linev

framework/CMakeLists.txt

@@ -125,12 +125,6 @@ STREAM_LINK_LIBRARY(Stream
    nx/Processor.cxx
 )
 
-if(APPLE)
-  target_compile_definitions(Stream PUBLIC STREAM_AARCH64)
-elseif(MSVC)
-  target_compile_definitions(Stream PUBLIC STREAM_WINDOWS)
-endif()
-
 foreach(dir base dogma get4 hadaq mbs nx)
    install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/${dir}
           DESTINATION ${STREAM_INSTALL_INCLUDEDIR})

framework/hadaq/TrbProcessor.cxx

@@ -13,7 +13,7 @@
 
 #include "dogma/defines.h"
 
-#ifdef STREAM_WINDOWS
+#ifdef __WINDOWS__
 #define RAWPRINT()
 #else
 #define RAWPRINT( args ... ) if(IsPrintRawData()) printf( args )

include/base/Profiler.h

@@ -23,7 +23,7 @@ namespace base {
       clock_t GetClock()
       {
 
-#ifdef STREAM_AARCH64
+#if defined(__MACH__)
          uint64_t virtual_timer_value;
          asm volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
          return virtual_timer_value;

include/dogma/tdc5.h

@@ -8,6 +8,18 @@
 #define be16toh(x) OSSwapBigToHostInt16(x)
 #define be32toh(x) OSSwapBigToHostInt32(x)
 #define be64toh(x) OSSwapBigToHostInt64(x)
+#elif defined(__WINDOWS__) /* Windows section */
+#include <winsock2.h>
+#include <sys/param.h>
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define be16toh(x) ntohs(x)
+#define be32toh(x) ntohl(x)
+#define be64toh(x) ntohll(x)
+#else
+#define be16toh(x) (x)
+#define be32toh(x) (x)
+#define be64toh(x) (x)
+#endif
 #else
 #include <endian.h>
 #endif