diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2006-10-17 21:45:37 +0000 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2006-10-17 21:45:37 +0000 |
commit | 8c38ea4ebcff4960b531a6f6fbac6b412609c986 (patch) | |
tree | 21cc048fc3296f6be8cf6a1de35146a6dad8ba9d /lib | |
parent | 44d84ac1646cf04ccc2c1a736f3c9d1644ccacec (diff) |
Fixed compile error in HAVE_SIGACTION case.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/url.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -3668,17 +3668,11 @@ static CURLcode CreateConnection(struct SessionHandle *data, * Set signal handler to catch SIGALRM * Store the old value to be able to set it back later! *************************************************************/ - long shortest = data->set.timeout; /* default to this timeout value */ - - if(shortest && data->set.connecttimeout && - (data->set.connecttimeout < shortest)) - /* if both are set, pick the shortest */ - shortest = data->set.connecttimeout; - else if(!shortest) - /* if timeout is not set, use the connect timeout */ - shortest = data->set.connecttimeout; #ifdef SIGALRM +#ifdef HAVE_ALARM + long shortest; +#endif #ifdef HAVE_SIGACTION struct sigaction sigact; sigaction(SIGALRM, NULL, &sigact); @@ -3704,6 +3698,15 @@ static CURLcode CreateConnection(struct SessionHandle *data, * multi-threaded environments. */ #ifdef HAVE_ALARM + shortest = data->set.timeout; /* default to this timeout value */ + if(shortest && data->set.connecttimeout && + (data->set.connecttimeout < shortest)) + /* if both are set, pick the shortest */ + shortest = data->set.connecttimeout; + else if(!shortest) + /* if timeout is not set, use the connect timeout */ + shortest = data->set.connecttimeout; + /* alarm() makes a signal get sent when the timeout fires off, and that will abort system calls */ prev_alarm = alarm((unsigned int) shortest); |