diff options
author | Daniel Stenberg <daniel@haxx.se> | 2001-11-06 19:33:13 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2001-11-06 19:33:13 +0000 |
commit | 2e32d415c0e7df143b93d6c112ffb88103f51058 (patch) | |
tree | ecad27e24d0bdeff2ba7172b5483c6c96901c294 /lib/setup.h | |
parent | 3dfc509d33d3f0ebc82ac4cc33522ff156d78838 (diff) |
myalarm() is history, we now use HAVE_ALARM and we now do our very best to
1 - restore the previous sigaction struct as soon as we are about to shut
off our timeout
2 - restore the previous alarm() timeout, in case an application or similar
had it running before we "borrowed" it for a while.
No, this does not fix the multi-thread problem you get with alarm(). This
patch should correct bug report #478780:
//sourceforge.net/tracker/?func=detail&atid=100976&aid=478780&group_id=976
If not, please post details!
Diffstat (limited to 'lib/setup.h')
-rw-r--r-- | lib/setup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/setup.h b/lib/setup.h index 6576919ea..30e945c2f 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -110,13 +110,13 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) #define sclose(x) closesocket(x) #define sread(x,y,z) recv(x,y,z,0) #define swrite(x,y,z) (size_t)send(x,y,z,0) -#define myalarm(x) /* win32 is a silly system */ +#undef HAVE_ALARM #else /* gcc-for-win is still good :) */ #define sclose(x) close(x) #define sread(x,y,z) recv(x,y,z,0) #define swrite(x,y,z) send(x,y,z,0) -#define myalarm(x) alarm(x) +#define HAVE_ALARM #endif #define PATH_CHAR ";" @@ -127,7 +127,7 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) #define sclose(x) close(x) #define sread(x,y,z) recv(x,y,z,0) #define swrite(x,y,z) send(x,y,z,0) -#define myalarm(x) alarm(x) +#define HAVE_ALARM #define PATH_CHAR ":" #define DIR_CHAR "/" |