From b12e78e64517d423aefecc84f23499b13aedd734 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 2 Jan 2009 13:39:26 +0100
Subject: tevent: use HAVE_EPOLL instead of HAVE_EVENTS_EPOLL

metze
---
 lib/tevent/libtevent.m4      | 2 --
 lib/tevent/tevent.c          | 4 ++--
 lib/tevent/tevent_internal.h | 4 ++--
 lib/tevent/tevent_standard.c | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'lib/tevent')

diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
index 30105d9bef..24cdd8c27f 100644
--- a/lib/tevent/libtevent.m4
+++ b/lib/tevent/libtevent.m4
@@ -26,8 +26,6 @@ if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x
    TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
    SMB_ENABLE(TEVENT_EPOLL,YES)
    AC_DEFINE(HAVE_EPOLL, 1, [Whether epoll available])
-   #TODO: remove HAVE_EVENTS_EPOLL and use HAVE_EPOLL
-   AC_DEFINE(HAVE_EVENTS_EPOLL, 1, [Whether epoll available])
 
    # check for native Linux AIO interface
    AC_CHECK_HEADERS(libaio.h)
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 676a3dc398..f79e4cefb5 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -108,10 +108,10 @@ static void tevent_backend_init(void)
 {
 	tevent_select_init();
 	tevent_standard_init();
-#if HAVE_EVENTS_EPOLL
+#ifdef HAVE_EPOLL
 	tevent_epoll_init();
 #endif
-#if HAVE_LINUX_AIO
+#ifdef HAVE_LINUX_AIO
 	tevent_aio_init();
 #endif
 }
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index a439c62743..b654e4b500 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -153,9 +153,9 @@ int common_event_check_signal(struct tevent_context *ev);
 
 bool tevent_standard_init(void);
 bool tevent_select_init(void);
-#if HAVE_EVENTS_EPOLL
+#ifdef HAVE_EPOLL
 bool tevent_epoll_init(void);
 #endif
-#if HAVE_LINUX_AIO
+#ifdef HAVE_LINUX_AIO
 bool tevent_aio_init(void);
 #endif
diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 1c60fc0167..7abb695d89 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -30,7 +30,7 @@
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/network.h"
-#include "system/select.h" /* needed for HAVE_EVENTS_EPOLL */
+#include "system/select.h"
 #include "tevent.h"
 #include "tevent_util.h"
 #include "tevent_internal.h"
@@ -64,7 +64,7 @@ struct std_event_context {
 };
 
 /* use epoll if it is available */
-#if HAVE_EVENTS_EPOLL
+#if HAVE_EPOLL
 /*
   called when a epoll call fails, and we should fallback
   to using select
-- 
cgit