From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Thu, 14 Mar 2002 04:35:27 +0000 (+0000)
Subject: avoid symbol clash with curses' "timeout" function (which may be a macro
X-Git-Tag: v7.86~6473
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=52b4bbf28301a4b3c7d84e7dfd2b80320634870b

avoid symbol clash with curses' "timeout" function (which may be a macro
in some versions)
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6dcf25e69..e366b9222 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 590.154  2002/03/14 04:35:26  nbryant
+ avoid symbol clash with curses' "timeout" function (which may be a macro
+ in some versions)
+
  Revision 590.153  2002/03/14 04:24:20  nbryant
  support window resizing in curses mode
 
@@ -3505,3 +3509,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import 
+
diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index 45775a8ca..f927a0848 100644
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -78,7 +78,7 @@ void connection_died(void) {
 }
 
 
-void timeout(int signum)
+static void ipc_timeout(int signum)
 {
 	err_printf("\rConnection timed out.\n");
 	logoff(3);
@@ -130,7 +130,7 @@ static int connectsock(char *host, char *service, char *protocol, int defaultPor
 		err_printf("Can't create socket: %s\n", strerror(errno));
 		logoff(3);
 	}
-	signal(SIGALRM, timeout);
+	signal(SIGALRM, ipc_timeout);
 	alarm(30);
 
 	if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {