[or-cvs] Appease weasel"s paranoid 64-bit compiler.

Nick Mathewson nickm at seul.org
Thu Jan 20 20:16:51 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv4694/src/or

Modified Files:
	main.c 
Log Message:
Appease weasel's paranoid 64-bit compiler.


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- main.c	17 Jan 2005 18:13:09 -0000	1.426
+++ main.c	20 Jan 2005 20:16:48 -0000	1.427
@@ -1031,19 +1031,19 @@
   switch(the_signal)
     {
     case 1:
-      signal_callback(0,0,(void*)SIGHUP);
+      signal_callback(0,0,(void*)(uintptr_t)SIGHUP);
       break;
     case 2:
-      signal_callback(0,0,(void*)SIGINT);
+      signal_callback(0,0,(void*)(uintptr_t)SIGINT);
       break;
     case 10:
-      signal_callback(0,0,(void*)SIGUSR1);
+      signal_callback(0,0,(void*)(uintptr_t)SIGUSR1);
       break;
     case 12:
-      signal_callback(0,0,(void*)SIGUSR2);
+      signal_callback(0,0,(void*)(uintptr_t)SIGUSR2);
       break;
     case 15:
-      signal_callback(0,0,(void*)SIGTERM);
+      signal_callback(0,0,(void*)(uintptr_t)SIGTERM);
       break;
     default:
       return -1;
@@ -1053,7 +1053,7 @@
 
 static void signal_callback(int fd, short events, void *arg)
 {
-  int sig = (int) arg;
+  uintptr_t sig = (uintptr_t)arg;
   switch (sig)
     {
     case SIGTERM:



More information about the tor-commits mailing list