summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-15 07:17:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:09 -0500
commitf428e045c31a27a1672fcbcaea0c6f99bbd4a84f (patch)
treec83d37818927769562f1233d4e1deb829c20dc98
parent916342d04bdac47818863d64cf2118fe456210e2 (diff)
downloadsamba-f428e045c31a27a1672fcbcaea0c6f99bbd4a84f.tar.gz
samba-f428e045c31a27a1672fcbcaea0c6f99bbd4a84f.tar.bz2
samba-f428e045c31a27a1672fcbcaea0c6f99bbd4a84f.zip
r20789: merge from samba4:
- remove the epoll configure checks from libreplace metze (This used to be commit 3061c333eca4aaff6af4b200cfe07d17f87018b2)
-rw-r--r--source3/lib/replace/libreplace.m43
-rw-r--r--source3/lib/replace/system/select.h9
2 files changed, 0 insertions, 12 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4
index d74ee6ed1e..1dfc823a68 100644
--- 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 0d1eabbc35..20346259c2 100644
--- 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