From 29ff2db5d3444d1abf61939f9f55390d3e58c9c4 Mon Sep 17 00:00:00 2001
From: ritt <stefan.ritt@psi.ch>
Date: Fri, 11 Feb 2022 14:16:55 +0100
Subject: [PATCH] Fixed bugs in CMakelists.txt and Makefile

---
 CMakeLists.txt | 5 ++---
 Makefile       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a600cd49..68153c25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,11 +19,10 @@ set(SRVDIR   /usr/lib/systemd/system)
 include_directories(${CMAKE_SOURCE_DIR}/mxml)
 
 # default compiler flags
-if (!MSVC)
-  add_compile_options(-W -Wall -Wno-deprecated-declarations)
-endif()
 if (MSVC)
   add_compile_options(/D_CRT_SECURE_WARNINGS /wd4005 /wd4244 /wd4267 /wd4996 /nologo)
+else()
+  add_compile_options(-W -Wall -Wno-deprecated-declarations)
 endif()
 
 # find git
diff --git a/Makefile b/Makefile
index 39ab802e..ba417041 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ USE_PAM    = 0
 #############################################################
 
 # Default compilation flags unless stated otherwise.
-CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -Wno-unused-results -Imxml
+CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -Wno-unused-result -Imxml
 
 CC = gcc
 EXECS = elog elogd elconv