gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36365 - in libmicrohttpd: . src/include src/microhttpd


From: gnunet
Subject: [GNUnet-SVN] r36365 - in libmicrohttpd: . src/include src/microhttpd
Date: Wed, 16 Sep 2015 11:08:18 +0200

Author: grothoff
Date: 2015-09-16 11:08:18 +0200 (Wed, 16 Sep 2015)
New Revision: 36365

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/mhd_mono_clock.c
Log:
-releasing 0.9.43

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-09-15 14:04:54 UTC (rev 36364)
+++ libmicrohttpd/ChangeLog     2015-09-16 09:08:18 UTC (rev 36365)
@@ -1,8 +1,11 @@
+Wed Sep 16 11:06:02 CEST 2015
+       Releasing libmicrohttpd 0.9.43. -CG
+
 Wed Sep  2 16:50:31 CEST 2015
        Call resume_suspended_connections() when the user is running
        its own mainloop and calls MHD_run_from_select() to support
        resuming connections with external select. -FC
-       
+
 Sun Aug 30 14:53:51 CEST 2015
        Correct documentation as to when MHD_USE_EPOLL_LINUX_ONLY
        is allowed. -CG

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2015-09-15 14:04:54 UTC (rev 36364)
+++ libmicrohttpd/configure.ac  2015-09-16 09:08:18 UTC (rev 36365)
@@ -22,15 +22,15 @@
 #
 AC_PREREQ([2.60])
 LT_PREREQ([2.4.0])
-AC_INIT([libmicrohttpd],[0.9.42],address@hidden)
+AC_INIT([libmicrohttpd],[0.9.43],address@hidden)
 AM_INIT_AUTOMAKE([silent-rules] [subdir-objects])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=42
+LIB_VERSION_CURRENT=43
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=32
+LIB_VERSION_AGE=33
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
@@ -485,7 +485,7 @@
     [[
       #include <mach/clock.h>
       #include <mach/mach.h>
-    ]], 
+    ]],
     [[
       clock_serv_t cs;
       mach_timespec_t mt;

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-09-15 14:04:54 UTC (rev 
36364)
+++ libmicrohttpd/src/include/microhttpd.h      2015-09-16 09:08:18 UTC (rev 
36365)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094211
+#define MHD_VERSION 0x00094300
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/mhd_mono_clock.c
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_mono_clock.c       2015-09-15 14:04:54 UTC 
(rev 36364)
+++ libmicrohttpd/src/microhttpd/mhd_mono_clock.c       2015-09-16 09:08:18 UTC 
(rev 36365)
@@ -47,17 +47,17 @@
 #endif /* HAVE_CLOCK_GETTIME */
 
 /* sync clocks; reduce chance of value wrap */
-static time_t mono_clock_start = 0;
-static time_t sys_clock_start = 0;
+static time_t mono_clock_start;
+static time_t sys_clock_start;
 #ifdef HAVE_GETHRTIME
-static hrtime_t hrtime_start = 0;
+static hrtime_t hrtime_start;
 #endif /* HAVE_GETHRTIME */
 #ifdef _WIN32
 #if _WIN32_WINNT >= 0x0600
-static uint64_t tick_start = 0;
+static uint64_t tick_start;
 #else  /* _WIN32_WINNT < 0x0600 */
-static int64_t perf_freq = 0;
-static int64_t perf_start = 0;
+static int64_t perf_freq;
+static int64_t perf_start;
 #endif /* _WIN32_WINNT < 0x0600 */
 #endif /* _WIN32 */
 
@@ -87,7 +87,7 @@
    * gethrtime() / 1000000000
    */
   _MHD_CLOCK_GETHRTIME,
-  
+
   /**
    * GetTickCount64() / 1000
    */
@@ -155,7 +155,7 @@
 #endif /* CLOCK_MONOTONIC_RAW */
 #ifdef CLOCK_BOOTTIME
   /* Linux-specific clock */
-  /* Count time in suspend so it's real monotonic on Linux, */ 
+  /* Count time in suspend so it's real monotonic on Linux, */
   /* but can be slower value-getting than other clocks */
   if (0 == clock_gettime(CLOCK_BOOTTIME, &ts))
     {
@@ -214,7 +214,7 @@
 #ifdef CLOCK_HIGHRES
   /* Solaris-specific monotonic high-resolution clock */
   /* Not preferred due to be potentially resource-hungry */
-  if (0 == clock_gettime(CLOCK_HIGHRES, &ts))
+  if (0 == clock_gettime (CLOCK_HIGHRES, &ts))
     {
       mono_clock_id = CLOCK_HIGHRES;
       mono_clock_start = ts.tv_sec;
@@ -237,16 +237,18 @@
     }
 
 #ifdef HAVE_CLOCK_GET_TIME
-  if (_MHD_CLOCK_GET_TIME != mono_clock_source &&
-      _MHD_INVALID_CLOCK_SERV != mono_clock_service)
+  if ( (_MHD_CLOCK_GET_TIME != mono_clock_source) &&
+       (_MHD_INVALID_CLOCK_SERV != mono_clock_service) )
     {
       /* clock service was initialised but clock_get_time failed */
-      mach_port_deallocate(mach_task_self(), mono_clock_service);
+      mach_port_deallocate (mach_task_self(), mono_clock_service);
       mono_clock_service = _MHD_INVALID_CLOCK_SERV;
     }
+#else
+  (void) mono_clock_source; /* avoid compiler warning */
 #endif /* HAVE_CLOCK_GET_TIME */
 
-  sys_clock_start = time(NULL);
+  sys_clock_start = time (NULL);
 }
 
 
@@ -254,7 +256,7 @@
  * Deinitialise monotonic seconds counter by freeing any allocated resources
  */
 void
-MHD_monotonic_sec_counter_finish(void)
+MHD_monotonic_sec_counter_finish (void)
 {
 #ifdef HAVE_CLOCK_GET_TIME
   if (_MHD_INVALID_CLOCK_SERV != mono_clock_service)
@@ -308,5 +310,5 @@
     return (time_t)(((uint64_t)(gethrtime() - hrtime_start)) / 1000000000);
 #endif /* HAVE_GETHRTIME */
 
-  return time(NULL) - sys_clock_start;
+  return time (NULL) - sys_clock_start;
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]