Rename four internal headers to follow the -internal.h convention.

svn:r1000

Makefile.am

@@ -102,7 +102,7 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
 	evrpc-internal.h strlcpy-internal.h evbuffer-internal.h \
 	bufferevent-internal.h http-internal.h event-internal.h \
 	evthread-internal.h \
-	min_heap.h log.h evsignal.h evmap.h
+	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h
 
 include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h event-config.h
 

WIN32-Code/win32.c

@@ -45,10 +45,10 @@
 
 #define RB_AUGMENT(x) (void)(x)
 #include "./tree.h"
-#include "log.h"
+#include "log-internal.h"
 #include "event.h"
 #include "event-internal.h"
-#include "evmap.h"
+#include "evmap-inernal.h"
 
 #define XFREE(ptr) do { if (ptr) mm_free(ptr); } while(0)
 

buffer.c

@@ -68,7 +68,7 @@
 #include "event2/event.h"
 #include "event2/buffer.h"
 #include "config.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "evbuffer-internal.h"
 

bufferevent.c

@@ -53,7 +53,7 @@
 #include "event2/buffer.h"
 #include "event2/bufferevent_struct.h"
 #include "event2/event.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "bufferevent-internal.h"
 #include "util-internal.h"

devpoll.c

@@ -49,9 +49,9 @@
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct devpollop {
 	struct pollfd *events;

epoll.c

@@ -49,9 +49,9 @@
 #endif
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct epollop {
 	struct epoll_event *events;

evdns.c

@@ -101,7 +101,7 @@
 
 #include "evdns.h"
 #include "evutil.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 #include "strlcpy-internal.h"
 #include "ipv6-internal.h"

event-internal.h

@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 #include "config.h"
-#include "min_heap.h"
-#include "evsignal.h"
+#include "minheap-internal.h"
+#include "evsignal-internal.h"
 #include "mm-internal.h"
 
 /* map union members back */

event.c

@@ -65,8 +65,8 @@
 #include "evthread-internal.h"
 #include "event2/thread.h"
 #include "event2/util.h"
-#include "log.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #ifdef HAVE_EVENT_PORTS
 extern const struct eventop evportops;

event_tagging.c

@@ -64,7 +64,7 @@
 #include "event2/event.h"
 #include "event2/tag.h"
 #include "event2/buffer.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 
 int evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf);

evmap-internal.h

@@ -27,7 +27,7 @@
 #ifndef _EVMAP_H_
 #define _EVMAP_H_
 
-/** @file evmap.h
+/** @file evmap-internal.h
  *
  * An event_map is a utility structure to map each fd or signal to zero or
  * more events.  Functions to manipulate event_maps should only be used from

evmap.c

@@ -53,7 +53,7 @@
 #include <time.h>
 
 #include "event-internal.h"
-#include "evmap.h"
+#include "evmap-internal.h"
 #include "mm-internal.h"
 
 /** An entry for an evmap_io list: notes all the events that want to read or

evport.c

@@ -71,9 +71,9 @@
 #endif
 
 #include "event-internal.h"
-#include "log.h"
-#include "evsignal.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evsignal-internal.h"
+#include "evmap-internal.h"
 
 /*
  * Default value for ed_nevents, which is the maximum file descriptor number we

evrpc.c

@@ -63,7 +63,7 @@
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
 #include "evutil.h"
-#include "log.h"
+#include "log-internal.h"
 #include "mm-internal.h"
 
 struct evrpc_base *

evutil.c

@@ -65,7 +65,7 @@
 #endif
 
 #include "event2/util.h"
-#include "log.h"
+#include "log-internal.h"
 
 #include "strlcpy-internal.h"
 #include "ipv6-internal.h"

http.c

@@ -91,7 +91,7 @@
 #include "event2/http_struct.h"
 #include "event2/http_compat.h"
 #include "event2/util.h"
-#include "log.h"
+#include "log-internal.h"
 #include "http-internal.h"
 #include "mm-internal.h"
 #include "util-internal.h"

kqueue.c

@@ -59,8 +59,8 @@
 #endif
 
 #include "event-internal.h"
-#include "log.h"
-#include "evmap.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #define NEVENT		64
 

log.c

@@ -60,7 +60,7 @@
 #include "event2/event.h"
 #include "event2/util.h"
 
-#include "log.h"
+#include "log-internal.h"
 
 static void _warn_helper(int severity, const char *errstr, const char *fmt,
                          va_list ap);

poll.c

@@ -47,9 +47,9 @@
 #include <assert.h>
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 struct pollop {
 	int event_count;		/* Highest number alloc */

select.c

@@ -49,9 +49,9 @@
 #include <assert.h>
 
 #include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 #ifndef howmany
 #define        howmany(x, y)   (((x)+((y)-1))/(y))

signal.c

@@ -61,9 +61,9 @@
 #include "event2/event_struct.h"
 #include "event-internal.h"
 #include "event2/util.h"
-#include "evsignal.h"
-#include "log.h"
-#include "evmap.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
 
 static int evsig_add(struct event_base *, int, short, short);
 static int evsig_del(struct event_base *, int, short, short);

test/regress.c

@@ -65,7 +65,7 @@
 #include "event2/util.h"
 #include "event-internal.h"
 #include "evbuffer-internal.h"
-#include "log.h"
+#include "log-internal.h"
 
 #include "regress.h"
 

test/regress_dns.c

@@ -62,7 +62,7 @@
 #include "event2/event.h"
 #include "event2/event_compat.h"
 #include "evdns.h"
-#include "log.h"
+#include "log-internal.h"
 
 static int dns_ok = 0;
 static int dns_err = 0;

test/regress_http.c

@@ -54,7 +54,7 @@
 
 #include "event.h"
 #include "evhttp.h"
-#include "log.h"
+#include "log-internal.h"
 #include "http-internal.h"
 
 extern int pair[];

test/regress_rpc.c

@@ -55,7 +55,7 @@
 
 #include "event2/event.h"
 #include "evhttp.h"
-#include "log.h"
+#include "log-internal.h"
 #include "evrpc.h"
 
 #include "regress.gen.h"