Updated 'nghttp2' time patch for new version.
This commit is contained in:
parent
b29e588c9b
commit
6f156be298
@ -1,16 +1,14 @@
|
|||||||
lib/nghttp2_time.c | 40 ++++++++++------------------------------
|
lib/nghttp2_time.c | 38 ++++++++++----------------------------
|
||||||
1 file changed, 10 insertions(+), 30 deletions(-)
|
1 file changed, 10 insertions(+), 28 deletions(-)
|
||||||
|
|
||||||
diff --git a/lib/nghttp2_time.c b/lib/nghttp2_time.c
|
diff --git a/lib/nghttp2_time.c b/lib/nghttp2_time.c
|
||||||
index 947b544..db18869 100644
|
index 148ccfdc..355b225a 100644
|
||||||
--- a/lib/nghttp2_time.c
|
--- a/lib/nghttp2_time.c
|
||||||
+++ b/lib/nghttp2_time.c
|
+++ b/lib/nghttp2_time.c
|
||||||
@@ -28,36 +28,16 @@
|
@@ -30,34 +30,16 @@
|
||||||
# include <windows.h>
|
|
||||||
#endif /* HAVE_WINDOWS_H */
|
#include <time.h>
|
||||||
|
|
||||||
-#include <time.h>
|
|
||||||
-
|
|
||||||
-#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
|
-#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
|
||||||
-static uint64_t time_now_sec(void) {
|
-static uint64_t time_now_sec(void) {
|
||||||
- time_t t = time(NULL);
|
- time_t t = time(NULL);
|
||||||
@ -30,7 +28,7 @@ index 947b544..db18869 100644
|
|||||||
-#if defined(HAVE_GETTICKCOUNT64) && !defined(__CYGWIN__)
|
-#if defined(HAVE_GETTICKCOUNT64) && !defined(__CYGWIN__)
|
||||||
-uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
|
-uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
|
||||||
-#elif defined(HAVE_CLOCK_GETTIME) && defined(HAVE_DECL_CLOCK_MONOTONIC) && \
|
-#elif defined(HAVE_CLOCK_GETTIME) && defined(HAVE_DECL_CLOCK_MONOTONIC) && \
|
||||||
- HAVE_DECL_CLOCK_MONOTONIC
|
- HAVE_DECL_CLOCK_MONOTONIC
|
||||||
-uint64_t nghttp2_time_now_sec(void) {
|
-uint64_t nghttp2_time_now_sec(void) {
|
||||||
- struct timespec tp;
|
- struct timespec tp;
|
||||||
- int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
|
- int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
|
||||||
|
Loading…
Reference in New Issue
Block a user