From 5b0e00782da2bbe9f9062884c9ae8ed330d5911e Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 10 Sep 2013 22:45:45 +0200 Subject: Move global variables from .h to .c files Simplify things by moving the definition of global variables into .c files, where they belong. --- plugins/netutils.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'plugins/netutils.h') diff --git a/plugins/netutils.h b/plugins/netutils.h index 5a495c91..347509e2 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h @@ -81,20 +81,14 @@ void host_or_die(const char *str); # define is_hostname(addr) resolve_host_or_addr(addr, AF_INET) #endif -#ifdef LOCAL_TIMEOUT_ALARM_HANDLER extern unsigned int socket_timeout; -extern int socket_timeout_state; -RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); -#else -unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT; -unsigned int socket_timeout_state = STATE_CRITICAL; -extern RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); -#endif - +extern unsigned int socket_timeout_state; extern int econn_refuse_state; extern int was_refused; extern int address_family; +RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); + /* SSL-Related functionality */ #ifdef HAVE_SSL /* maybe this could be merged with the above np_net_connect, via some flags */ -- cgit v1.2.3-74-g34f1