[GNUnet-SVN] r9558 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2009-11-16 06:41:07 -0700 (Mon, 16 Nov 2009)
New Revision: 9558

Modified:
   libmicrohttpd/src/daemon/daemon.c
Log:
better, use time_t

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2009-11-16 13:40:10 UTC (rev 9557)
+++ libmicrohttpd/src/daemon/daemon.c   2009-11-16 13:41:07 UTC (rev 9558)
@@ -488,7 +488,7 @@
   int max;
   struct timeval tv;
   unsigned int timeout;
-  unsigned int now;
+  time_t now;
   struct MHD_Pollfd mp;
   struct pollfd p;
 
@@ -496,8 +496,7 @@
   while ((!con->daemon->shutdown) && (con->socket_fd != -1)) {
       now = time (NULL);
       tv.tv_usec = 0;
-      if ( ( (timeout > (now - con->last_activity)) &&
-            (now > con->last_activity) ) ||
+      if ( (timeout > (now - con->last_activity)) ||
           (timeout == 0) )
        {
          /* in case we are missing the SIGALRM, keep going after