summaryrefslogtreecommitdiff
path: root/src/monitor/main.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-06-30 19:30:49 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-06-30 20:57:13 -0700
commitaa4df026d44bd205f8bfce8a3b8d6a1144332f32 (patch)
tree397692da57b2be8f7c083989ed37fb03308d5b2c /src/monitor/main.cpp
parent7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77 (diff)
downloadtmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.gz
tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.bz2
tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.xz
tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.zip
Finally get around to decoupling the warning system
Diffstat (limited to 'src/monitor/main.cpp')
-rw-r--r--src/monitor/main.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/monitor/main.cpp b/src/monitor/main.cpp
index 5d7478d..ec1139a 100644
--- a/src/monitor/main.cpp
+++ b/src/monitor/main.cpp
@@ -140,10 +140,10 @@ pid_t start_process(ZString exec)
}
if (pid == 0)
{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
+ DIAG_PUSH();
+ DIAG_I(cast_qual);
execv(exec.c_str(), const_cast<char **>(args));
-#pragma GCC diagnostic pop
+ DIAG_POP();
perror("Failed to exec");
kill(getppid(), SIGABRT);
exit(1);
@@ -161,11 +161,11 @@ void stop_process(int sig)
kill(pid_login, sig);
if (pid_char)
kill(pid_char, sig);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+ DIAG_PUSH();
+ DIAG_I(old_style_cast);
+ DIAG_I(zero_as_null_pointer_constant);
signal(sig, SIG_DFL);
-#pragma GCC diagnostic pop
+ DIAG_POP();
raise(sig);
}
} // namespace tmwa