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

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 = \

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;

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
 

evutil_time.c

@@ -131,4 +131,3 @@ evutil_usleep_(const struct timeval *tv)
 	select(0, NULL, NULL, NULL, tv);
 #endif
 }
-

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;

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"
 

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

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"
 

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_ */

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);

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)