cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 09:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move event-config.h to include/event2

Browse Source 
This change means that all required include files are in event2, and
all files not in event2/* are optional.
This commit is contained in:
Nick Mathewson 2010-07-07 16:45:03 -04:00
parent 5fa30d2bf4
commit ec347b9225
86 changed files with 100 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -66,6 +66,8 @@ libevent.pc
/missing /missing
/stamp-h1 /stamp-h1
/include/event2/event-config.h
/sample/dns-example /sample/dns-example
/sample/event-test /sample/event-test
/sample/hello-world /sample/hello-world

20
Makefile.am
View File

@ -135,10 +135,11 @@ if SIGNAL_SUPPORT
SYS_SRC += signal.c SYS_SRC += signal.c
endif endif
BUILT_SOURCES = event-config.h BUILT_SOURCES = ./include/event2/event-config.h
event-config.h: config.h ./include/event2/event-config.h: config.h
echo '/* event-config.h' > $@ @MKDIR_P@ ./include/event2
echo '/* event2/event-config.h' > $@
echo ' *' >> $@ echo ' *' >> $@
echo ' * This file was generated by autoconf when libevent was built, and post-' >> $@ echo ' * This file was generated by autoconf when libevent was built, and post-' >> $@
echo ' * processed by Libevent so that its macros would have a uniform prefix.' >> $@ echo ' * processed by Libevent so that its macros would have a uniform prefix.' >> $@
@ -147,8 +148,8 @@ event-config.h: config.h
echo ' *' >> $@ echo ' *' >> $@
echo ' * Do not rely on macros in this file existing in later versions.'>> $@ echo ' * Do not rely on macros in this file existing in later versions.'>> $@
echo ' */' >> $@ echo ' */' >> $@
echo '#ifndef _EVENT_CONFIG_H_' >> $@ echo '#ifndef _EVENT2_EVENT_CONFIG_H_' >> $@
echo '#define _EVENT_CONFIG_H_' >> $@ echo '#define _EVENT2_EVENT_CONFIG_H_' >> $@
sed -e 's/#define /#define _EVENT_/' \ sed -e 's/#define /#define _EVENT_/' \
-e 's/#undef /#undef _EVENT_/' \ -e 's/#undef /#undef _EVENT_/' \
@ -201,15 +202,13 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \ minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \
changelist-internal.h iocp-internal.h \ changelist-internal.h iocp-internal.h \
ratelim-internal.h \ ratelim-internal.h \
WIN32-Code/event-config.h \ WIN32-Code/event2/event-config.h \
WIN32-Code/tree.h \ WIN32-Code/tree.h \
compat/sys/queue.h compat/sys/queue.h
include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
nodist_include_HEADERS = event-config.h INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include $(SYS_INCLUDES)
verify: check verify: check
@ -217,4 +216,5 @@ doxygen: FORCE
doxygen $(srcdir)/Doxyfile doxygen $(srcdir)/Doxyfile
FORCE: FORCE:
DISTCLEANFILES = *~ event-config.h libevent.pc DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h

2
WIN32-Code/event-config.h → WIN32-Code/event2/event-config.h
View File

@ -1,4 +1,4 @@
/* event-config.h /* event2/event-config.h
* *
* This file was generated by autoconf when libevent was built, and post- * This file was generated by autoconf when libevent was built, and post-
* processed by Libevent so that its macros would have a uniform prefix. * processed by Libevent so that its macros would have a uniform prefix.

4
buffer.c
View File

@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>
@ -82,7 +82,7 @@
#include "event2/bufferevent_compat.h" #include "event2/bufferevent_compat.h"
#include "event2/bufferevent_struct.h" #include "event2/bufferevent_struct.h"
#include "event2/thread.h" #include "event2/thread.h"
#include "event-config.h" #include "event2/event-config.h"
#include "log-internal.h" #include "log-internal.h"
#include "mm-internal.h" #include "mm-internal.h"
#include "util-internal.h" #include "util-internal.h"

2
buffer_iocp.c
View File

@ -35,7 +35,7 @@
#include "event2/buffer_compat.h" #include "event2/buffer_compat.h"
#include "event2/util.h" #include "event2/util.h"
#include "event2/thread.h" #include "event2/thread.h"
#include "event-config.h" #include "event2/event-config.h"
#include "util-internal.h" #include "util-internal.h"
#include "evthread-internal.h" #include "evthread-internal.h"
#include "evbuffer-internal.h" #include "evbuffer-internal.h"

2
bufferevent-internal.h
View File

@ -30,7 +30,7 @@
extern "C" { extern "C" {
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include "evutil.h" #include "evutil.h"
#include "defer-internal.h" #include "defer-internal.h"
#include "evthread-internal.h" #include "evthread-internal.h"

2
bufferevent.c
View File

@ -27,7 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>

2
bufferevent_async.c
View File

@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>

2
bufferevent_filter.c
View File

@ -28,7 +28,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>

2
bufferevent_openssl.c
View File

@ -26,7 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>

2
bufferevent_pair.c
View File

@ -30,7 +30,7 @@
#include <winsock2.h> #include <winsock2.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include "event2/util.h" #include "event2/util.h"
#include "event2/buffer.h" #include "event2/buffer.h"

2
bufferevent_sock.c
View File

@ -28,7 +28,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>

1
configure.in
View File

@ -18,6 +18,7 @@ dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MKDIR_P
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL

2
defer-internal.h
View File

@ -30,7 +30,7 @@
extern "C" { extern "C" {
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/queue.h> #include <sys/queue.h>
struct deferred_cb; struct deferred_cb;

2
devpoll.c
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/resource.h> #include <sys/resource.h>

2
epoll.c
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>

2
evbuffer-internal.h
View File

@ -31,7 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include "event2/util.h" #include "event2/util.h"
#include "util-internal.h" #include "util-internal.h"
#include "defer-internal.h" #include "defer-internal.h"

2
evdns.c
View File

@ -35,7 +35,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifndef _FORTIFY_SOURCE #ifndef _FORTIFY_SOURCE
#define _FORTIFY_SOURCE 3 #define _FORTIFY_SOURCE 3

2
event-internal.h
View File

@ -31,7 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/queue.h> #include <sys/queue.h>
#include "event2/event_struct.h" #include "event2/event_struct.h"
#include "minheap-internal.h" #include "minheap-internal.h"

2
event.c
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
event.h
View File

@ -162,7 +162,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
event_rpcgen.py
View File

@ -1574,7 +1574,7 @@ class CCodeGenerator:
pre += ( '#include <stdlib.h>\n' pre += ( '#include <stdlib.h>\n'
'#include <string.h>\n' '#include <string.h>\n'
'#include <assert.h>\n' '#include <assert.h>\n'
'#include <event-config.h>\n' '#include <event2/event-config.h>\n'
'#include <event2/event.h>\n' '#include <event2/event.h>\n'
'#include <event2/buffer.h>\n' '#include <event2/buffer.h>\n'
'#include <event2/tag.h>\n\n' '#include <event2/tag.h>\n\n'

2
event_tagging.c
View File

@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>

2
evmap.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
evport.c
View File

@ -50,7 +50,7 @@
* As in the select(2) implementation, signals are handled by evsignal. * As in the select(2) implementation, signals are handled by evsignal.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/time.h> #include <sys/time.h>
#include <sys/queue.h> #include <sys/queue.h>

2
evrpc.c
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
evthread-internal.h
View File

@ -31,7 +31,7 @@ extern "C" {
#endif #endif
#include <event2/thread.h> #include <event2/thread.h>
#include "event-config.h" #include "event2/event-config.h"
#include "util-internal.h" #include "util-internal.h"
struct event_base; struct event_base;

2
evthread.c
View File

@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifndef _EVENT_DISABLE_THREAD_SUPPORT #ifndef _EVENT_DISABLE_THREAD_SUPPORT

2
evthread_pthread.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
/* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */ /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */
#define _GNU_SOURCE #define _GNU_SOURCE

2
evthread_win32.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
evutil.c
View File

@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#define _GNU_SOURCE #define _GNU_SOURCE

2
evutil_rand.c
View File

@ -32,7 +32,7 @@
* so that other people can rip it out and use it for whatever. * so that other people can rip it out and use it for whatever.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include "util-internal.h" #include "util-internal.h"
#include "evthread-internal.h" #include "evthread-internal.h"

2
http.c
View File

@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT_HAVE_SYS_PARAM_H #ifdef _EVENT_HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>

2
include/Makefile.am
View File

@ -27,5 +27,5 @@ EVENT2_EXPORT = \
EXTRA_SRC = $(EVENT2_EXPORT) EXTRA_SRC = $(EVENT2_EXPORT)
nobase_include_HEADERS = $(EVENT2_EXPORT) nobase_include_HEADERS = $(EVENT2_EXPORT) ./event2/event-config.h

2
include/event2/buffer.h
View File

@ -65,7 +65,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#include <stdarg.h> #include <stdarg.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>

2
include/event2/bufferevent.h
View File

@ -54,7 +54,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/bufferevent_ssl.h
View File

@ -31,7 +31,7 @@
OpenSSL support for bufferevents. OpenSSL support for bufferevents.
*/ */
#include <event-config.h> #include <event2/event-config.h>
#include <event2/bufferevent.h> #include <event2/bufferevent.h>
#include <event2/util.h> #include <event2/util.h>

2
include/event2/bufferevent_struct.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/dns_compat.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/dns_struct.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/event.h
View File

@ -37,7 +37,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/event_compat.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/event_struct.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/http_compat.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/http_struct.h
View File

@ -38,7 +38,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/tag.h
View File

@ -37,7 +37,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H #ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
include/event2/thread.h
View File

@ -57,7 +57,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
/** A flag passed to a locking callback when the lock was allocated as a /** A flag passed to a locking callback when the lock was allocated as a
* read-write lock, and we want to acquire or release the lock for writing. */ * read-write lock, and we want to acquire or release the lock for writing. */

2
include/event2/util.h
View File

@ -37,7 +37,7 @@
extern "C" { extern "C" {
#endif #endif
#include <event-config.h> #include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif

2
ipv6-internal.h
View File

@ -34,7 +34,7 @@
#ifdef _EVENT_HAVE_SYS_SOCKET_H #ifdef _EVENT_HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <event2/util.h> #include <event2/util.h>
#ifdef __cplusplus #ifdef __cplusplus

2
kqueue.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#define _GNU_SOURCE #define _GNU_SOURCE

2
listener.c
View File

@ -26,7 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
log.c
View File

@ -37,7 +37,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
minheap-internal.h
View File

@ -28,7 +28,7 @@
#ifndef _MIN_HEAP_H_ #ifndef _MIN_HEAP_H_
#define _MIN_HEAP_H_ #define _MIN_HEAP_H_
#include "event-config.h" #include "event2/event-config.h"
#include "event2/event.h" #include "event2/event.h"
#include "event2/event_struct.h" #include "event2/event_struct.h"
#include "event2/util.h" #include "event2/util.h"

2
poll.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H

2
sample/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
LDADD = ../libevent.la LDADD = ../libevent.la
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include
noinst_PROGRAMS = event-test time-test signal-test dns-example hello-world noinst_PROGRAMS = event-test time-test signal-test dns-example hello-world

2
sample/dns-example.c
View File

@ -5,7 +5,7 @@
XXX It's pretty ugly and should probably be cleaned up. XXX It's pretty ugly and should probably be cleaned up.
*/ */
#include <event-config.h> #include <event2/event-config.h>
#include <sys/types.h> #include <sys/types.h>

2
sample/event-test.c
View File

@ -8,7 +8,7 @@
* cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent
*/ */
#include <event-config.h> #include <event2/event-config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
sample/signal-test.c
View File

@ -6,7 +6,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <event-config.h> #include <event2/event-config.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef WIN32 #ifndef WIN32

2
sample/time-test.c
View File

@ -10,7 +10,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <event-config.h> #include <event2/event-config.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef WIN32 #ifndef WIN32

2
select.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H #ifdef _EVENT_HAVE_SYS_TIME_H

2
signal.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
strlcpy-internal.h
View File

@ -5,7 +5,7 @@
extern "C" { extern "C" {
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#ifndef _EVENT_HAVE_STRLCPY #ifndef _EVENT_HAVE_STRLCPY
#include <string.h> #include <string.h>

2
strlcpy.c
View File

@ -33,7 +33,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
#include <sys/types.h> #include <sys/types.h>
#include "event-config.h" #include "event2/event-config.h"
#ifndef _EVENT_HAVE_STRLCPY #ifndef _EVENT_HAVE_STRLCPY
#include "strlcpy-internal.h" #include "strlcpy-internal.h"

4
test/Makefile.am
View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include
EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c test.sh EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c test.sh
@ -44,7 +44,7 @@ endif
regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS) regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \ regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \
-I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) -I$(top_srcdir)/include -I../include $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
regress_LDFLAGS = $(PTHREAD_CFLAGS) regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL if OPENSSL

2
test/bench.c
View File

@ -33,7 +33,7 @@
* *
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/bench_cascade.c
View File

@ -25,7 +25,7 @@
* *
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/bench_http.c
View File

@ -25,7 +25,7 @@
* *
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/regress.c
View File

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/regress_buffer.c
View File

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

4
test/regress_bufferevent.c
View File

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -58,7 +58,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include "event2/event.h" #include "event2/event.h"
#include "event2/event_struct.h" #include "event2/event_struct.h"
#include "event2/event_compat.h" #include "event2/event_compat.h"

2
test/regress_dns.c
View File

@ -31,7 +31,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/regress_et.c
View File

@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <event-config.h> #include <event2/event-config.h>
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
test/regress_http.c
View File

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

4
test/regress_main.c
View File

@ -32,7 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#ifdef _EVENT___func__ #ifdef _EVENT___func__
#define __func__ _EVENT___func__ #define __func__ _EVENT___func__
@ -71,7 +71,7 @@
#include <event2/dns_compat.h> #include <event2/dns_compat.h>
#include <event2/thread.h> #include <event2/thread.h>
#include "event-config.h" #include "event2/event-config.h"
#include "regress.h" #include "regress.h"
#include "tinytest.h" #include "tinytest.h"
#include "tinytest_macros.h" #include "tinytest_macros.h"

2
test/regress_pthread.c
View File

@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>

2
test/regress_rpc.c
View File

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/regress_testutils.c
View File

@ -30,7 +30,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/regress_util.c
View File

@ -29,7 +29,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>

2
test/regress_zlib.c
View File

@ -29,7 +29,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#ifndef WIN32 #ifndef WIN32

2
test/test-changelist.c
View File

@ -2,7 +2,7 @@
* based on test-eof.c * based on test-eof.c
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
test/test-eof.c
View File

@ -2,7 +2,7 @@
* Compile with: * Compile with:
* cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
test/test-init.c
View File

@ -2,7 +2,7 @@
* Compile with: * Compile with:
* cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/test-time.c
View File

@ -2,7 +2,7 @@
* Compile with: * Compile with:
* cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
*/ */
#include "event-config.h" #include "event2/event-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
test/test-weof.c
View File

@ -2,7 +2,7 @@
* Compile with: * Compile with:
* cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
*/ */
#include "event-config.h" #include "event2/event-config.h"
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>

2
util-internal.h
View File

@ -26,7 +26,7 @@
#ifndef _EVENT_UTIL_INTERNAL_H #ifndef _EVENT_UTIL_INTERNAL_H
#define _EVENT_UTIL_INTERNAL_H #define _EVENT_UTIL_INTERNAL_H
#include "event-config.h" #include "event2/event-config.h"
#include <errno.h> #include <errno.h>
/* For EVUTIL_ASSERT */ /* For EVUTIL_ASSERT */

2
win32select.c
View File

@ -38,7 +38,7 @@
#include <errno.h> #include <errno.h>
#include "event2/util.h" #include "event2/util.h"
#include "event-config.h" #include "event2/event-config.h"
#include "util-internal.h" #include "util-internal.h"
#include "log-internal.h" #include "log-internal.h"
#include "event2/event.h" #include "event2/event.h"