Warning fixes and copyright update.

[evaf] / src / main / CLI / exithandler.cpp

diff --git a/src/main/CLI/exithandler.cpp b/src/main/CLI/exithandler.cpp
index a96842d084ce71a2485380e450ff671670ccf7f6..0961ce5a547db21c36aaf910a8663caba321dac2 100644 (file)
--- a/src/main/CLI/exithandler.cpp
+++ b/src/main/CLI/exithandler.cpp
@@ -3,7 +3,7 @@
  * @brief Exit handlers for the eVaf main executable
  * @author Enar Vaikene
  *
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
@@ -24,7 +24,7 @@
 
 #include <QtCore>
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 #  include <signal.h>
 #endif
 
@@ -36,7 +36,7 @@ namespace eVaf {
 namespace CLI {
 namespace Internal {
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 
 /**
  * Signal handler on Linux
@@ -111,15 +111,15 @@ static BOOL WINAPI signalHandler(DWORD sig)
 bool eVaf::CLI::Internal::installExitHandler()
 {
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = signalHandler;
-    if (sigaction(SIGTERM, &sa, NULL) != 0) {
+    if (sigaction(SIGTERM, &sa, nullptr) != 0) {
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }
-    if (sigaction(SIGHUP, &sa, NULL) != 0) {
+    if (sigaction(SIGHUP, &sa, nullptr) != 0) {
         EVAF_FATAL_ERROR("sigaction() failed: %m");
         return false;
     }