From 9156cd0e1ded8d26c8c46c5926e6c56d7253fe47 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 26 Aug 2020 09:49:33 +0200
Subject: [PATCH] Remove redundant -DNOMINMAX definition. Adds syscall include
on unix systems.
---
CMakeLists.txt | 4 ----
src/basics/basics/utilities/UbSystem.h | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2e150dbd..d6f7bd4d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,10 +43,6 @@ include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
#################################################################################
# COMMON LIBRARIES
#################################################################################
-if(MSVC)
- ADD_DEFINITIONS ( "-DNOMINMAX" ) # Disable Min/Max-Macros
-endif()
-
add_subdirectory(src/basics)
#################################################################################
diff --git a/src/basics/basics/utilities/UbSystem.h b/src/basics/basics/utilities/UbSystem.h
index 3f215f5b9..dcfa4fc6d 100644
--- a/src/basics/basics/utilities/UbSystem.h
+++ b/src/basics/basics/utilities/UbSystem.h
@@ -71,8 +71,8 @@
#if defined(__unix__) && defined(__CYGWIN__)
#define UBSYSTEM_CYGWIN
#include <windows.h>
-#else
- //#include <sys/syscall.h> // TODO: Did not work on windows!
+#elif defined(__unix__)
+ #include <sys/syscall.h>
#endif
#if defined(min) || defined(max) //daruch kann man sich spaeter #undef min; #undef max erparen
--
GitLab