Retire libcompat's clock_gettime().

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1717 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/Makefile.am b/varnish-cache/include/Makefile.am
index 8b09fa074dcd34a57e28634e03b5a8a5e2af9fa9..5f8c6f06d2742bbed1a683a77bda2e2fd201302f 100644 (file)
--- a/varnish-cache/include/Makefile.am
+++ b/varnish-cache/include/Makefile.am
@@ -13,7 +13,6 @@ noinst_HEADERS = \
        cli_common.h \
        cli_priv.h \
        compat/asprintf.h \
-       compat/clock_gettime.h \
        compat/setproctitle.h \
        compat/srandomdev.h \
        compat/strlcat.h \

diff --git a/varnish-cache/include/compat/clock_gettime.h b/varnish-cache/include/compat/clock_gettime.h
deleted file mode 100644 (file)
index 2045e11..0000000
--- a/varnish-cache/include/compat/clock_gettime.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
- * All rights reserved.
- *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-#ifndef COMPAT_CLOCK_GETTIME_H_INCLUDED
-#define COMPAT_CLOCK_GETTIME_H_INCLUDED
-
-#ifndef HAVE_CLOCK_GETTIME
-typedef enum {
-       CLOCK_REALTIME,
-       CLOCK_MONOTONIC,
-} clockid_t;
-
-int clock_gettime(clockid_t clk_id, struct timespec *tp);
-#endif
-
-#endif

diff --git a/varnish-cache/lib/libcompat/Makefile.am b/varnish-cache/lib/libcompat/Makefile.am
index 7bbeada8d58b07ad90fbd24b0a995eb59cefb27f..885d3a075677a6db6446e5f0b350f5f272199b9c 100644 (file)
--- a/varnish-cache/lib/libcompat/Makefile.am
+++ b/varnish-cache/lib/libcompat/Makefile.am
@@ -6,7 +6,6 @@ noinst_LIBRARIES = libcompat.a
 
 libcompat_a_SOURCES = \
        asprintf.c \
-       clock_gettime.c \
        vasprintf.c \
        setproctitle.c \
        srandomdev.c \

diff --git a/varnish-cache/lib/libcompat/clock_gettime.c b/varnish-cache/lib/libcompat/clock_gettime.c
deleted file mode 100644 (file)
index 4914c2c..0000000
--- a/varnish-cache/lib/libcompat/clock_gettime.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
- * All rights reserved.
- *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- *
- */
-
-#ifndef HAVE_CLOCK_GETTIME
-
-#include <sys/time.h>
-
-#include <errno.h>
-#include <time.h>
-
-#include "compat/clock_gettime.h"
-
-int
-clock_gettime(clockid_t clk_id, struct timespec *tp)
-{
-       struct timeval tv;
-
-       switch (clk_id) {
-       case CLOCK_REALTIME:
-       case CLOCK_MONOTONIC:
-               if (gettimeofday(&tv, NULL) != 0)
-                       return (-1);
-               tp->tv_sec = tv.tv_sec;
-               tp->tv_nsec = tv.tv_usec * 1000;
-               return (0);
-       default:
-               errno = EINVAL;
-               return (-1);
-       }
-}
-#endif