diff options
Diffstat (limited to '')
-rw-r--r-- | keyserver/ChangeLog | 5 | ||||
-rw-r--r-- | keyserver/ksutil.c | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 4738f70b0..abeecb66e 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 David Shaw <[email protected]> + + * ksutil.c [HAVE_DOSISH_SYSTEM]: Fix warnings on mingw32. Noted + by Joe Vender. + 2005-05-04 David Shaw <[email protected]> * ksutil.h, ksutil.c: #ifdef so we can build without libcurl or diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 365cbddbf..0e14e2eaf 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.c @@ -36,6 +36,13 @@ #include "keyserver.h" #include "ksutil.h" +#ifdef HAVE_DOSISH_SYSTEM + +unsigned int set_timeout(unsigned int seconds) {return 0;} +int register_timeout(void) {return 0;} + +#else + static void catch_alarm(int foo) { @@ -45,19 +52,12 @@ catch_alarm(int foo) unsigned int set_timeout(unsigned int seconds) { -#ifdef HAVE_DOSISH_SYSTEM - return 0; -#else return alarm(seconds); -#endif } int register_timeout(void) { -#ifdef HAVE_DOSISH_SYSTEM - return 0; -#else #if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION) struct sigaction act; @@ -71,9 +71,10 @@ register_timeout(void) else return 0; #endif -#endif } +#endif /* !HAVE_DOSISH_SYSTEM */ + struct ks_options * init_ks_options(void) { |