diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2003-12-05 16:42:38 (GMT) |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2003-12-05 16:42:38 (GMT) |
commit | 8a4567f0b83c7882f932488cfafc29466c5f5b0e (patch) | |
tree | 37de8c000dbb2ba7f3da605c200ac8288a570230 | |
parent | d049302c50da32414f52386cba3af565a1aa2660 (diff) | |
download | monitoring-plugins-8a4567f0b83c7882f932488cfafc29466c5f5b0e.tar.gz |
Fix clash of namespace for my_connect with mysql (854339 - Ian Holsman)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@784 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | plugins/netutils.c | 3 | ||||
-rw-r--r-- | plugins/netutils.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/netutils.c b/plugins/netutils.c index 58b3fb4..8c5deb0 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c | |||
@@ -37,6 +37,7 @@ int econn_refuse_state = STATE_CRITICAL; | |||
37 | int was_refused = FALSE; | 37 | int was_refused = FALSE; |
38 | int address_family = AF_UNSPEC; | 38 | int address_family = AF_UNSPEC; |
39 | 39 | ||
40 | static int my_connect(const char *address, int port, int *sd, int proto); | ||
40 | /* handles socket timeouts */ | 41 | /* handles socket timeouts */ |
41 | void | 42 | void |
42 | socket_timeout_alarm_handler (int sig) | 43 | socket_timeout_alarm_handler (int sig) |
@@ -246,7 +247,7 @@ my_udp_connect (const char *host_name, int port, int *sd) | |||
246 | 247 | ||
247 | 248 | ||
248 | /* opens a tcp or udp connection to a remote host */ | 249 | /* opens a tcp or udp connection to a remote host */ |
249 | int | 250 | static int |
250 | my_connect (const char *host_name, int port, int *sd, int proto) | 251 | my_connect (const char *host_name, int port, int *sd, int proto) |
251 | { | 252 | { |
252 | struct addrinfo hints; | 253 | struct addrinfo hints; |
diff --git a/plugins/netutils.h b/plugins/netutils.h index c560f44..88a5162 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h | |||
@@ -47,7 +47,6 @@ int process_request (const char *address, int port, int proto, | |||
47 | 47 | ||
48 | int my_tcp_connect (const char *address, int port, int *sd); | 48 | int my_tcp_connect (const char *address, int port, int *sd); |
49 | int my_udp_connect (const char *address, int port, int *sd); | 49 | int my_udp_connect (const char *address, int port, int *sd); |
50 | int my_connect (const char *address, int port, int *sd, int proto); | ||
51 | 50 | ||
52 | int is_host (const char *); | 51 | int is_host (const char *); |
53 | int is_addr (const char *); | 52 | int is_addr (const char *); |