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

diff --git a/plugins/netutils.c b/plugins/netutils.c
index 58b3fb485456593ebb9794e625e11f650047a45f..8c5deb0403c9b3f10d5315782a3a22eb928fe594 100644 (file)
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -37,6 +37,7 @@ int econn_refuse_state = STATE_CRITICAL;
 int was_refused = FALSE;
 int address_family = AF_UNSPEC;
 
+static int my_connect(const char *address, int port, int *sd, int proto);
 /* handles socket timeouts */
 void
 socket_timeout_alarm_handler (int sig)
@@ -246,7 +247,7 @@ my_udp_connect (const char *host_name, int port, int *sd)
 
 
 /* opens a tcp or udp connection to a remote host */
-int
+static int
 my_connect (const char *host_name, int port, int *sd, int proto)
 {
        struct addrinfo hints;

diff --git a/plugins/netutils.h b/plugins/netutils.h
index c560f4492bdf62404840a1025dab592bee7d618d..88a5162e7082059a45a2ceba271f9b4639fac30d 100644 (file)
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -47,7 +47,6 @@ int process_request (const char *address, int port, int proto,
 
 int my_tcp_connect (const char *address, int port, int *sd);
 int my_udp_connect (const char *address, int port, int *sd);
-int my_connect (const char *address, int port, int *sd, int proto);
 
 int is_host (const char *);
 int is_addr (const char *);