svn commit: samba r20789 - in branches/SAMBA_3_0/source/lib/replace: . system

[metze at samba.org]

Author: metze
Date: 2007-01-15 07:17:02 +0000 (Mon, 15 Jan 2007)
New Revision: 20789

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20789

Log:
merge from samba4:

- remove the epoll configure checks from libreplace

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0/source/lib/replace/system/select.h


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-01-15 07:15:47 UTC (rev 20788)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-01-15 07:17:02 UTC (rev 20789)
@@ -63,9 +63,6 @@
 
 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])],,
 [

Modified: branches/SAMBA_3_0/source/lib/replace/system/select.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/system/select.h	2007-01-15 07:15:47 UTC (rev 20788)
+++ branches/SAMBA_3_0/source/lib/replace/system/select.h	2007-01-15 07:17:02 UTC (rev 20789)
@@ -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