[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37723 - libmicrohttpd/src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37723 - libmicrohttpd/src/microhttpd |
Date: |
Tue, 16 Aug 2016 14:17:47 +0200 |
Author: Karlson2k
Date: 2016-08-16 14:17:46 +0200 (Tue, 16 Aug 2016)
New Revision: 37723
Modified:
libmicrohttpd/src/microhttpd/mhd_mono_clock.c
libmicrohttpd/src/microhttpd/mhd_mono_clock.h
Log:
mhd_mono_clock: do not use large includes in header
Modified: libmicrohttpd/src/microhttpd/mhd_mono_clock.c
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_mono_clock.c 2016-08-16 03:47:32 UTC
(rev 37722)
+++ libmicrohttpd/src/microhttpd/mhd_mono_clock.c 2016-08-16 12:17:46 UTC
(rev 37723)
@@ -30,6 +30,21 @@
#undef HAVE_CLOCK_GETTIME
#endif /* _WIN32 && HAVE_CLOCK_GETTIME */
+#ifdef HAVE_CLOCK_GETTIME
+#include <time.h>
+#endif /* HAVE_CLOCK_GETTIME */
+
+#ifdef HAVE_GETHRTIME
+#ifdef HAVE_SYS_TIME_H
+/* Solaris define gethrtime() in sys/time.h */
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
+#ifdef HAVE_TIME_H
+/* HP-UX define gethrtime() in time.h */
+#include <time.h>
+#endif /* HAVE_TIME_H */
+#endif /* HAVE_GETHRTIME */
+
#ifdef HAVE_CLOCK_GET_TIME
#include <mach/mach.h>
/* for host_get_clock_service(), mach_host_self(), mach_task_self() */
@@ -41,6 +56,15 @@
static clock_serv_t mono_clock_service = _MHD_INVALID_CLOCK_SERV;
#endif /* HAVE_CLOCK_GET_TIME */
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+/* Do not include unneeded parts of W32 headers. */
+#define WIN32_LEAN_AND_MEAN 1
+#endif /* !WIN32_LEAN_AND_MEAN */
+#include <windows.h>
+#include <stdint.h>
+#endif /* _WIN32 */
+
#ifdef HAVE_CLOCK_GETTIME
#ifdef CLOCK_REALTIME
#define _MHD_UNWANTED_CLOCK CLOCK_REALTIME
Modified: libmicrohttpd/src/microhttpd/mhd_mono_clock.h
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_mono_clock.h 2016-08-16 03:47:32 UTC
(rev 37722)
+++ libmicrohttpd/src/microhttpd/mhd_mono_clock.h 2016-08-16 12:17:46 UTC
(rev 37723)
@@ -25,8 +25,14 @@
#ifndef MHD_MONO_CLOCK_H
#define MHD_MONO_CLOCK_H 1
-#include "platform.h"
+#include "mhd_options.h"
+#if defined(HAVE_TIME_H)
+#include <time.h>
+#elif defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
/**
* Initialise monotonic seconds counter.
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37723 - libmicrohttpd/src/microhttpd,
gnunet <=