avoid symbol clash with curses' "timeout" function (which may be a macro

in some versions)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6dcf25e69e236c0190886059dfe4ae3865dfccf9..e366b9222671d150f623b1b1825ff5c9863bcf47 100644 (file)
--- 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 45775a8cada7e3faa3f8638b845fe44d47d00560..f927a084805f0342cfbae0a49195b09888169293 100644 (file)
--- 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) {