[GNUnet-SVN] r34111 - in libmicrohttpd: doc src/include

[gnunet]

Author: harsha
Date: 2014-08-05 15:17:57 +0200 (Tue, 05 Aug 2014)
New Revision: 34111

Modified:
   libmicrohttpd/doc/libmicrohttpd.texi
   libmicrohttpd/src/include/microhttpd.h
Log:
Mention the timeout as milliseconds.


Modified: libmicrohttpd/doc/libmicrohttpd.texi
===================================================================
--- libmicrohttpd/doc/libmicrohttpd.texi        2014-08-05 11:59:52 UTC (rev 
34110)
+++ libmicrohttpd/doc/libmicrohttpd.texi        2014-08-05 13:17:57 UTC (rev 
34111)
@@ -1460,14 +1460,14 @@
 @deftypefun int MHD_get_timeout (struct MHD_Daemon *daemon, unsigned long long 
*timeout)
 @cindex timeout
 Obtain timeout value for select for this daemon (only needed if
-connection timeout is used).  The returned value is how long
address@hidden should at most block, not the timeout value set for
-connections.  This function must not be called if the
address@hidden mode is in use (since then it
-is not meaningful to ask for a timeout, after all, there is
-concurrenct activity).  The function must also not be called by
-user-code if @code{MHD_USE_INTERNAL_SELECT} is in use.  In the latter
-case, the behavior is undefined.
+connection timeout is used).  The returned value is how many
+milliseconds @code{select} should at most block, not the timeout value
+set for connections.  This function must not be called if the
address@hidden mode is in use (since then it is
+not meaningful to ask for a timeout, after all, there is concurrenct
+activity).  The function must also not be called by user-code if
address@hidden is in use.  In the latter case, the
+behavior is undefined.
 
 @table @var
 @item daemon

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2014-08-05 11:59:52 UTC (rev 
34110)
+++ libmicrohttpd/src/include/microhttpd.h      2014-08-05 13:17:57 UTC (rev 
34111)
@@ -1531,10 +1531,10 @@
 
 /**
  * Obtain timeout value for `select()` for this daemon (only needed if
- * connection timeout is used).  The returned value is how long
- * `select()` or `poll()` should at most block, not the timeout value set
- * for connections.  This function MUST NOT be called if MHD is
- * running with #MHD_USE_THREAD_PER_CONNECTION.
+ * connection timeout is used).  The returned value is how many milliseconds
+ * `select()` or `poll()` should at most block, not the timeout value set for
+ * connections.  This function MUST NOT be called if MHD is running with
+ * #MHD_USE_THREAD_PER_CONNECTION.
  *
  * @param daemon daemon to query for timeout
  * @param timeout set to the timeout (in milliseconds)