From bf5a940ed48e2baaca8cd8305d0b631fb81ca118 Mon Sep 17 00:00:00 2001 From: Nils Maier Date: Sun, 18 Aug 2013 05:59:52 +0200 Subject: [PATCH] Define a type for signal handlers --- src/util.cc | 6 +++--- src/util.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/util.cc b/src/util.cc index b238b345..c53c09aa 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1237,8 +1237,8 @@ bool isNumericHost(const std::string& name) namespace { static Lock win_signal_lock; - static void(*win_int_handler)(int) = nullptr; - static void(*win_term_handler)(int) = nullptr; + static signal_handler_t win_int_handler = nullptr; + static signal_handler_t win_term_handler = nullptr; static void win_ign_handler(int) {} @@ -1279,7 +1279,7 @@ namespace { } #endif -void setGlobalSignalHandler(int sig, sigset_t* mask, void (*handler)(int), +void setGlobalSignalHandler(int sig, sigset_t* mask, signal_handler_t handler, int flags) { #if _WIN32 if (sig == SIGINT || sig == SIGTERM) { diff --git a/src/util.h b/src/util.h index 352384e7..92bd1d00 100644 --- a/src/util.h +++ b/src/util.h @@ -334,8 +334,9 @@ char toLowerChar(char c); bool isNumericHost(const std::string& name); -void setGlobalSignalHandler(int signal, sigset_t* mask, void (*handler)(int), - int flags); +typedef void(*signal_handler_t)(int); +void setGlobalSignalHandler(int signal, sigset_t* mask, + signal_handler_t handler, int flags); std::string getHomeDir();