[Nagiosplug-checkins] CVS: nagiosplug/plugins netutils.h,1.7,1.8 netutils.c,1.14,1.15

Ton Voon tonvoon at users.sourceforge.net
Fri Dec 5 08:43:01 CET 2003


Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv14976

Modified Files:
	netutils.h netutils.c 
Log Message:
Fix clash of namespace for my_connect with mysql (854339 - Ian Holsman)


Index: netutils.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** netutils.h	8 Aug 2003 16:49:32 -0000	1.7
--- netutils.h	5 Dec 2003 16:42:38 -0000	1.8
***************
*** 48,52 ****
  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 *);
--- 48,51 ----

Index: netutils.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** netutils.c	8 Aug 2003 16:49:32 -0000	1.14
--- netutils.c	5 Dec 2003 16:42:38 -0000	1.15
***************
*** 38,41 ****
--- 38,42 ----
  int address_family = AF_UNSPEC;
  
+ static int my_connect(const char *address, int port, int *sd, int proto);
  /* handles socket timeouts */
  void
***************
*** 247,251 ****
  
  /* opens a tcp or udp connection to a remote host */
! int
  my_connect (const char *host_name, int port, int *sd, int proto)
  {
--- 248,252 ----
  
  /* opens a tcp or udp connection to a remote host */
! static int
  my_connect (const char *host_name, int port, int *sd, int proto)
  {





More information about the Commits mailing list