diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2008-09-19 17:46:59 +0000 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2008-09-19 17:46:59 +0000 |
commit | 459e67b2a7290bc57dec773756d24d4503ac6d48 (patch) | |
tree | ce606e192ea62645b764ac6b1e2e3529e259fde1 | |
parent | 51ba24991ce8072ab464bd836f8c32b284ecbac5 (diff) |
Only define alarmfunc when signals are used
-rw-r--r-- | lib/url.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -150,10 +150,6 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by /* The last #include file should be: */ #include "memdebug.h" -#ifdef __SYMBIAN32__ -#undef SIGALRM -#endif - /* Local static prototypes */ static long ConnectionKillOne(struct SessionHandle *data); static bool ConnectionExists(struct SessionHandle *data, @@ -178,13 +174,10 @@ static void flush_cookies(struct SessionHandle *data, int cleanup); #define verboseconnect(x) do { } while (0) #endif -#ifndef USE_ARES -/* not for ares builds */ - #ifndef WIN32 /* not for WIN32 builds */ -#ifdef SIGALRM +#if defined(HAVE_ALARM) && defined(SIGALRM) && !defined(USE_ARES) /* * This signal handler jumps back into the main libcurl code and continues * execution. This effectively causes the remainder of the application to run @@ -200,9 +193,8 @@ RETSIGTYPE alarmfunc(int sig) #endif return; } -#endif /* SIGALRM */ +#endif /* HAVE_ALARM && SIGALRM && !USE_ARES */ #endif /* WIN32 */ -#endif /* USE_ARES */ /* * Protocol table. |