gnupg/keyserver (ChangeLog ksutil.c)

[cvs user dshaw]

    Date: Wednesday, June 1, 2005 @ 21:08:56
  Author: dshaw
    Path: /cvs/gnupg/gnupg/keyserver

Modified: ChangeLog ksutil.c

* ksutil.c [HAVE_DOSISH_SYSTEM]: Fix warnings on mingw32.  Noted by Joe
Vender.


-----------+
 ChangeLog |    5 +++++
 ksutil.c  |   17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)


Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.128 gnupg/keyserver/ChangeLog:1.129
--- gnupg/keyserver/ChangeLog:1.128	Wed May  4 15:34:25 2005
+++ gnupg/keyserver/ChangeLog	Wed Jun  1 21:08:56 2005
@@ -1,3 +1,8 @@
+2005-06-01  David Shaw  <dshaw at jabberwocky.com>
+
+	* ksutil.c [HAVE_DOSISH_SYSTEM]: Fix warnings on mingw32.  Noted
+	by Joe Vender.
+
 2005-05-04  David Shaw  <dshaw at jabberwocky.com>
 
 	* ksutil.h, ksutil.c: #ifdef so we can build without libcurl or
Index: gnupg/keyserver/ksutil.c
diff -u gnupg/keyserver/ksutil.c:1.10 gnupg/keyserver/ksutil.c:1.11
--- gnupg/keyserver/ksutil.c:1.10	Tue May 31 10:39:14 2005
+++ gnupg/keyserver/ksutil.c	Wed Jun  1 21:08:56 2005
@@ -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 @@
 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 @@
   else
     return 0;
 #endif
-#endif
 }
 
+#endif /* !HAVE_DOSISH_SYSTEM */
+
 struct ks_options *
 init_ks_options(void)
 {