Merging debian version 1.9.4-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 67 deletions

diff --git a/debian/vendor-h2o/include/h2o/time_.h b/debian/vendor-h2o/include/h2o/time_.h
deleted file mode 100644
index 1bab3ef..0000000
--- a/debian/vendor-h2o/include/h2o/time_.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2015 DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef h2o__time_h
-#define h2o__time_h
-
-#include <stdint.h>
-#include <sys/time.h>
-#include <time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define H2O_TIMESTR_RFC1123_LEN (sizeof("Sun, 06 Nov 1994 08:49:37 GMT") - 1)
-#define H2O_TIMESTR_LOG_LEN (sizeof("29/Aug/2014:15:34:38 +0900") - 1)
-
-/**
- * builds a RFC-1123 style date string
- */
-void h2o_time2str_rfc1123(char *buf, struct tm *gmt);
-/**
- * converts HTTP-date to packed format (or returns UINT64_MAX on failure)
- */
-int h2o_time_parse_rfc1123(const char *s, size_t len, struct tm *tm);
-/**
- * builds an Apache log-style date string
- */
-void h2o_time2str_log(char *buf, time_t time);
-
-static inline int64_t h2o_timeval_subtract(struct timeval *from, struct timeval *until)
-{
-    int32_t delta_sec = (int32_t)until->tv_sec - (int32_t)from->tv_sec;
-    int32_t delta_usec = (int32_t)until->tv_usec - (int32_t)from->tv_usec;
-    int64_t delta = (int64_t)((int64_t)delta_sec * 1000 * 1000L) + delta_usec;
-
-    return delta;
-}
-
-static inline int h2o_timeval_is_null(struct timeval *tv)
-{
-    return tv->tv_sec == 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif