From 339341ba4e270cc86e82db008e6325f03d1046f7 Mon Sep 17 00:00:00 2001
From: Leonid Bobrov <mazocomp@disroot.org>
Date: Sun, 3 Feb 2019 10:53:54 +0200
Subject: DragonFly BSD is somewhat identical to FreeBSD (#8159)
---
src/CMakeLists.txt | 4 ++--
src/gui/intlGUIEditBox.cpp | 2 +-
src/irrlicht_changes/irrUString.h | 2 +-
src/threading/thread.cpp | 6 +++---
src/util/serialize.h | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8218d586c..ee67a83e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -719,11 +719,11 @@ else()
endif()
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
- if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
+ if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
else()
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer")
- endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
+ endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
index 6bbf74a7f..fd3caa0f7 100644
--- a/src/gui/intlGUIEditBox.cpp
+++ b/src/gui/intlGUIEditBox.cpp
@@ -270,7 +270,7 @@ bool intlGUIEditBox::OnEvent(const SEvent& event)
break;
case EET_KEY_INPUT_EVENT:
{
-#if (defined(__linux__) || defined(__FreeBSD__))
+#if (defined(__linux__) || defined(__FreeBSD__)) || defined(__DragonFly__)
// ################################################################
// ValkaTR:
// This part is the difference from the original intlGUIEditBox
diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h
index aead68bab..fce49e717 100644
--- a/src/irrlicht_changes/irrUString.h
+++ b/src/irrlicht_changes/irrUString.h
@@ -48,7 +48,7 @@
#define __BIG_ENDIAN 1
#elif defined(__MACH__) && defined(__APPLE__)
#include <machine/endian.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/endian.h>
#else
#include <endian.h>
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 3b6851389..e0f808c4d 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE.
// for setName
#if defined(__linux__)
#include <sys/prctl.h>
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#include <pthread_np.h>
#elif defined(_MSC_VER)
struct THREADNAME_INFO {
@@ -213,7 +213,7 @@ void Thread::setName(const std::string &name)
// distributions are still runing 2.11 and previous versions.
prctl(PR_SET_NAME, name.c_str());
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
pthread_set_name_np(pthread_self(), name.c_str());
@@ -273,7 +273,7 @@ bool Thread::bindToProcessor(unsigned int proc_number)
return SetThreadAffinityMask(pthread_gethandle(getThreadHandle()), 1 << proc_number);
-#elif __FreeBSD_version >= 702106 || defined(__linux__)
+#elif __FreeBSD_version >= 702106 || defined(__linux__) || defined(__DragonFly__)
cpu_set_t cpuset;
diff --git a/src/util/serialize.h b/src/util/serialize.h
index 5eb2b5f2e..8ef0ad1c2 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define __BIG_ENDIAN 1
#elif defined(__MACH__) && defined(__APPLE__)
#include <machine/endian.h>
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/endian.h>
#else
#include <endian.h>
--
cgit v1.2.3