summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorbibo38 <bibo38@users.noreply.github.com>2017-12-21 12:36:58 +0100
committerAlexander Harkness <me@bearbin.net>2017-12-21 12:36:58 +0100
commit532731e6f4c0d843d355ff8f2d9f63e4e7854e6a (patch)
tree68c7c70e33fde99b21de53e1b3c7b86c6872c8b5 /src/main.cpp
parentAdded Github-related rules to Contributing.md (#4076) (diff)
downloadcuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar.gz
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar.bz2
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar.lz
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar.xz
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.tar.zst
cuberite-532731e6f4c0d843d355ff8f2d9f63e4e7854e6a.zip
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e3d4542dd..5e6872a9a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,6 +72,12 @@ bool cRoot::m_RunAsService = false;
#ifndef _DEBUG
+// Because SIG_DFL or SIG_IGN could be NULL instead of nullptr, we need to disable the Clang warning here
+#if __clang_major__ >= 5
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+
static void NonCtrlHandler(int a_Signal)
{
LOGD("Terminate event raised from std::signal");
@@ -115,6 +121,10 @@ static void NonCtrlHandler(int a_Signal)
default: break;
}
}
+
+#if __clang_major__ >= 5
+ #pragma clang diagnostic pop
+#endif
#endif // _DEBUG