Split out time-related prototypes into time-internal.h

diff --git a/Makefile.am b/Makefile.am
index 2ae90a3010429baee54c2bd5b4f45d0a72e7c22e..f8ac75b0bcfed627e7d0be1869bee30506d615cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,6 +270,7 @@ noinst_HEADERS =                            \
        ratelim-internal.h                      \
        ratelim-internal.h                      \
        strlcpy-internal.h                      \
+       time-internal.h                         \
        util-internal.h
 
 EVENT1_HDRS = \

diff --git a/epoll.c b/epoll.c
index 74b8d37de41fc58581955988c1cb8b62e4f9d2ce..a40939c479b27f13b3a36f304ebb006b423d3f11 100644 (file)
--- a/epoll.c
+++ b/epoll.c
@@ -55,6 +55,7 @@
 #include "log-internal.h"
 #include "evmap-internal.h"
 #include "changelist-internal.h"
+#include "time-internal.h"
 
 struct epollop {
        struct epoll_event *events;

diff --git a/evthread_win32.c b/evthread_win32.c
index a0eedcbdac26500047b743c8ff4f3bf9e90323f0..fb319e77cc0fab6e3498515a6b386cac42042c93 100644 (file)
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@ -43,6 +43,7 @@ struct event_base;
 
 #include "mm-internal.h"
 #include "evthread-internal.h"
+#include "time-internal.h"
 
 #define SPIN_COUNT 2000
 

diff --git a/evutil_time.c b/evutil_time.c
index 967fcbe6a0094781816591b385066249387d01c5..211a64383b49271e8381f82ecb856ad1788ef080 100644 (file)
--- a/evutil_time.c
+++ b/evutil_time.c
@@ -131,4 +131,3 @@ evutil_usleep_(const struct timeval *tv)
        select(0, NULL, NULL, NULL, tv);
 #endif
 }
-

diff --git a/poll.c b/poll.c
index 0114485481044d910544345f16c080db21e1732e..51475934b3480e705239eba7664df430eff79de4 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -51,6 +51,7 @@
 #include "evmap-internal.h"
 #include "event2/thread.h"
 #include "evthread-internal.h"
+#include "time-internal.h"
 
 struct pollidx {
        int idxplus1;

diff --git a/test/regress.c b/test/regress.c
index 64262ce438edec7b3f078f656de3dd48cf036c11..5718c1b67d1ce52b522ed538175cd137a0c465e1 100644 (file)
--- a/test/regress.c
+++ b/test/regress.c
@@ -65,6 +65,7 @@
 #include "event-internal.h"
 #include "evthread-internal.h"
 #include "log-internal.h"
+#include "time-internal.h"
 
 #include "regress.h"
 

diff --git a/test/regress_thread.c b/test/regress_thread.c
index a588dc4b6ddef06f8649beb8ee7b286b8c2cab76..091bcb73e31c8293d6832cacde2225d28d450bce 100644 (file)
--- a/test/regress_thread.c
+++ b/test/regress_thread.c
@@ -63,6 +63,7 @@
 #include "defer-internal.h"
 #include "regress.h"
 #include "tinytest_macros.h"
+#include "time-internal.h"
 
 #ifdef EVENT__HAVE_PTHREADS
 #define THREAD_T pthread_t

diff --git a/test/regress_util.c b/test/regress_util.c
index 33053291ea6091c7e7cc197eb471d46d7e1dd526..38b91cf6e8b6d88a86f53ca4bd0953cdab8ef1ae 100644 (file)
--- a/test/regress_util.c
+++ b/test/regress_util.c
@@ -58,6 +58,7 @@
 #include "../log-internal.h"
 #include "../strlcpy-internal.h"
 #include "../mm-internal.h"
+#include "../time-internal.h"
 
 #include "regress.h"
 

diff --git a/time-internal.h b/time-internal.h
new file mode 100644 (file)
index 0000000..42dbcc0
--- /dev/null
+++ b/time-internal.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
+ */
+#ifndef TIME_INTERNAL_H_INCLUDED_
+#define TIME_INTERNAL_H_INCLUDED_
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+#include "event2/util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+long evutil_tv_to_msec_(const struct timeval *tv);
+void evutil_usleep_(const struct timeval *tv);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT_INTERNAL_H_INCLUDED_ */

diff --git a/util-internal.h b/util-internal.h
index 5248ab21dd1520552a8f51c68e07771480b316af..98c816841a691a9ec3b1cd82cc7da565c6bb9fb9 100644 (file)
--- a/util-internal.h
+++ b/util-internal.h
@@ -43,6 +43,7 @@
 #endif
 #include "event2/util.h"
 
+#include "time-internal.h"
 #include "ipv6-internal.h"
 
 #ifdef __cplusplus
@@ -367,11 +368,8 @@ int evutil_sockaddr_is_loopback_(const struct sockaddr *sa);
  */
 const char *evutil_format_sockaddr_port_(const struct sockaddr *sa, char *out, size_t outlen);
 
-long evutil_tv_to_msec_(const struct timeval *tv);
-
 int evutil_hex_char_to_int_(char c);
 
-void evutil_usleep_(const struct timeval *tv);
 
 void evutil_free_secure_rng_globals_(void);
 void evutil_free_globals_(void);

diff --git a/win32select.c b/win32select.c
index 7be2389f38d7381abf97bd81ea41109178c6146f..2c407e4a09bab94056e1e8b36413bb68933ff8fd 100644 (file)
--- a/win32select.c
+++ b/win32select.c
@@ -49,6 +49,7 @@
 #include "evmap-internal.h"
 #include "event2/thread.h"
 #include "evthread-internal.h"
+#include "time-internal.h"
 
 #define XFREE(ptr) do { if (ptr) mm_free(ptr); } while (0)