*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 87ad31847a43df9f3e21e6641feece552e89d8d8..4e988c6417386186ca5d5bd4dff38444678c8bd7 100644 (file)
--- a/event.h
+++ b/event.h
@@ -28,15 +28,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  * (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 _EVENT_H_
-#define _EVENT_H_
+#ifndef EVENT_H__
+#define EVENT_H__

 
 

-#include <ev.h>
+#ifdef EV_H
+# include EV_H
+#else
+# include <ev.h>
+#endif

 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 

+struct event_base;
+

 struct event
 {
   /* libev watchers we map onto */
 struct event
 {
   /* libev watchers we map onto */


@@ -111,8 +117,6 @@ int event_pending (struct event *ev, short, struct timeval *tv);
 int event_priority_init (int npri);
 int event_priority_set (struct event *ev, int pri);
 
 int event_priority_init (int npri);
 int event_priority_set (struct event *ev, int pri);
 

-struct event_base;
-

 int event_base_set (struct event_base *base, struct event *ev);
 int event_base_loop (struct event_base *base, int);
 int event_base_loopexit (struct event_base *base, struct timeval *tv);
 int event_base_set (struct event_base *base, struct event *ev);
 int event_base_loop (struct event_base *base, int);
 int event_base_loopexit (struct event_base *base, struct timeval *tv);


@@ -121,7 +125,7 @@ int event_base_once (struct event_base *base, int fd, short events, void (*cb)(i
 int event_base_priority_init (struct event_base *base, int fd);
 
 #ifndef EV_STANDALONE
 int event_base_priority_init (struct event_base *base, int fd);
 
 #ifndef EV_STANDALONE

-# include "event_compat.h"
+# include <event_compat.h>

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus