r20789: merge from samba4:

- remove the epoll configure checks from libreplace

metze
(This used to be commit 3061c333eca4aaff6af4b200cfe07d17f87018b2)

diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4
index d74ee6ed1e480678c674503a701dba24d23f99fd..1dfc823a68a4517e9a20c7a17efda98415e5179b 100644 (file)
--- a/source3/lib/replace/libreplace.m4
+++ b/source3/lib/replace/libreplace.m4
@@ -63,9 +63,6 @@ AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat ge
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
 
-AC_CHECK_HEADERS(sys/epoll.h)
-AC_CHECK_FUNCS(epoll_create)
-
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
 [

diff --git a/source3/lib/replace/system/select.h b/source3/lib/replace/system/select.h
index 0d1eabbc35d217148ce3d662ce06f3d668c11d64..20346259c2760518ba63656da81ebb6332cbc316 100644 (file)
--- a/source3/lib/replace/system/select.h
+++ b/source3/lib/replace/system/select.h
@@ -30,13 +30,4 @@
 #define SELECT_CAST
 #endif
 
-/* use epoll if it is available */
-#if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H)
-#define WITH_EPOLL 1
-#endif
-
-#if WITH_EPOLL
-#include <sys/epoll.h>
-#endif
-
 #endif