From 7497bf2bd3cac45e82dc71e39ab619de4b03d7d7 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Mon, 8 Feb 2021 21:01:30 +0700
Subject: [PATCH] [*] Fixed some macroses for BSD [*] Fixed OS detection
---
cmake/OS_Detection.cmake | 2 --
dap-sdk/core/include/portable_endian.h | 15 +++++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/cmake/OS_Detection.cmake b/cmake/OS_Detection.cmake
index ff6953f204..f51b0c6f6d 100644
--- a/cmake/OS_Detection.cmake
+++ b/cmake/OS_Detection.cmake
@@ -47,8 +47,6 @@ if(UNIX)
if (APPLE)
add_definitions ("-DDAP_OS_DARWIN -DDARWIN -DDAP_OS_BSD")
set(DARWIN ON)
- else()
- add_definitions ("-DDAP_OS_LINUX")
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "BSD" )
diff --git a/dap-sdk/core/include/portable_endian.h b/dap-sdk/core/include/portable_endian.h
index 31c0809d91..48134cb7eb 100644
--- a/dap-sdk/core/include/portable_endian.h
+++ b/dap-sdk/core/include/portable_endian.h
@@ -50,14 +50,29 @@
# include <sys/endian.h>
+#if !defined(be16toh)
# define be16toh(x) betoh16(x)
+#endif
+
+#if !defined(le16toh)
# define le16toh(x) letoh16(x)
+#endif
+#if !defined(be32toh)
# define be32toh(x) betoh32(x)
+#endif
+
+#if !defined(le32toh)
# define le32toh(x) letoh32(x)
+#endif
+#if !defined(be64toh)
# define be64toh(x) betoh64(x)
+#endif
+
+#if !defined(le64toh)
# define le64toh(x) letoh64(x)
+#endif
#elif defined(__WINDOWS__)
--
GitLab