tevent: use HAVE_EPOLL instead of HAVE_EVENTS_EPOLL

metze

diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
index 30105d9bef04c25c660ca411948bc8b3545a8c59..24cdd8c27fd7305b3e06709afac6981aab92736e 100644 (file)
--- 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 676a3dc398b3db76b68d0668061a0e84dc0228e5..f79e4cefb5790e46d7bb06954b1ed1942c209c3a 100644 (file)
--- 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 a439c62743ca3e07504befeba016e74bf323d148..b654e4b50098b5cb03943af3f9a48c3cf27897d7 100644 (file)
--- 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 1c60fc0167f67cdf5dd411e80beccb5309381ecc..7abb695d891640adff4d4f2bfd012f7baebbf13b 100644 (file)
--- 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