summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-01-20 20:16:48 +0000
committerNick Mathewson <nickm@torproject.org>2005-01-20 20:16:48 +0000
commit5b455278513d995b91d2f7d4524ec22fd2b64ba0 (patch)
treea4598202246f4952ce4a6aac518764c12e47491d /src
parenta2e441da065d284a1a07b614517206d269e005f1 (diff)
downloadtor-5b455278513d995b91d2f7d4524ec22fd2b64ba0.tar.gz
tor-5b455278513d995b91d2f7d4524ec22fd2b64ba0.zip
Appease weasel's paranoid 64-bit compiler.
svn:r3389
Diffstat (limited to 'src')
-rw-r--r--src/or/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 54e6d3be6b..6be0205878 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1031,19 +1031,19 @@ control_signal_act(int the_signal)
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 @@ control_signal_act(int the_signal)
static void signal_callback(int fd, short events, void *arg)
{
- int sig = (int) arg;
+ uintptr_t sig = (uintptr_t)arg;
switch (sig)
{
case SIGTERM: