Merge pull request #2247 from Begasus/haiku

Haiku build fixes
eclipse · Jul 9, 2021 · e3158e2 · e3158e2
2 parents 30b54ba + 0f49a9f
commit e3158e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -175,6 +175,8 @@ if (UNIX)
  set (MOSQ_LIBS ${MOSQ_LIBS} m)
  elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  set (MOSQ_LIBS ${MOSQ_LIBS} m)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
+ set (MOSQ_LIBS ${MOSQ_LIBS} m network)
  elseif(QNX)
  set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
  else(APPLE)

diff --git a/src/conf_includedir.c b/src/conf_includedir.c
@@ -39,7 +39,9 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 # include <ws2tcpip.h>
 #endif
 
-#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__QNX__)
+#if defined(__HAIKU__)
+# include <syslog.h>
+#elif !defined(WIN32) && !defined(__CYGWIN__) && !defined(__QNX__)
 # include <sys/syslog.h>
 #endif