diff options
| author | Thomas Harning Jr <harningt@gmail.com> | 2011-01-15 19:51:21 -0500 |
|---|---|---|
| committer | Thomas Harning Jr <harningt@gmail.com> | 2011-01-15 19:51:21 -0500 |
| commit | 1153affe43bbc7f929213e0a5d6f8b5189cc45bd (patch) | |
| tree | 1e63a88fdebccabf3529fa9c697c3f43b067c673 /include | |
| parent | 24cac1c1bcf4b0dc3188f72934d2881692829e61 (diff) | |
| parent | d6cfe3ef1bc7d3c489abe394830211906e650d2c (diff) | |
| download | luaevent-prosody-1153affe43bbc7f929213e0a5d6f8b5189cc45bd.tar.gz luaevent-prosody-1153affe43bbc7f929213e0a5d6f8b5189cc45bd.zip | |
Merge branch 'prosody-tree'
Diffstat (limited to 'include')
| -rw-r--r-- | include/buffer_event.h | 4 | ||||
| -rw-r--r-- | include/event_buffer.h | 4 | ||||
| -rw-r--r-- | include/event_callback.h | 4 | ||||
| -rw-r--r-- | include/luaevent.h | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/include/buffer_event.h b/include/buffer_event.h index b3fe3c1..ad8fc55 100644 --- a/include/buffer_event.h +++ b/include/buffer_event.h @@ -4,10 +4,6 @@ #define BUFFER_EVENT_H #include "luaevent.h" -#include <lua.h> -#include <sys/types.h> -#include <sys/time.h> -#include <event.h> typedef struct { struct bufferevent* ev; diff --git a/include/event_buffer.h b/include/event_buffer.h index a7b1525..0ee4cd2 100644 --- a/include/event_buffer.h +++ b/include/event_buffer.h @@ -4,10 +4,6 @@ #define EVENT_BUFFER_H #include "luaevent.h" -#include <lua.h> -#include <sys/types.h> -#include <sys/time.h> -#include <event.h> typedef struct { struct evbuffer* buffer; diff --git a/include/event_callback.h b/include/event_callback.h index 38aedb8..fcda8ce 100644 --- a/include/event_callback.h +++ b/include/event_callback.h @@ -4,10 +4,6 @@ #define EVENT_CALLBACK #include "luaevent.h" -#include <lua.h> -#include <sys/types.h> -#include <sys/time.h> -#include <event.h> typedef struct { struct event ev; diff --git a/include/luaevent.h b/include/luaevent.h index ef3386b..e419998 100644 --- a/include/luaevent.h +++ b/include/luaevent.h @@ -5,7 +5,11 @@ #include <lua.h> #include <sys/types.h> +#ifdef _WIN32 +#include <winsock2.h> +#else #include <sys/time.h> +#endif #include <event.h> typedef struct { |