3 files changed, 6 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bbd4aeaf..a739f235a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    and no fd passing support.
  - (stevesk) HAVE_MMAP and HAVE_SYS_MMAN_H and use them in
    monitor_mm.c
+ - (stevesk) remove configure support for poll.h; it was removed
+   from sshd.c a long time ago.
 
 20020406
  - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann 
@@ -8195,4 +8197,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2036 2002/04/07 17:08:53 stevesk Exp $
+$Id: ChangeLog,v 1.2037 2002/04/07 18:12:03 stevesk Exp $
diff --git a/configure.ac b/configure.ac
index 875bc771f..b3fa18674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.37 2002/04/07 17:08:54 stevesk Exp $
+# $Id: configure.ac,v 1.38 2002/04/07 18:12:04 stevesk Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -314,10 +314,10 @@ AC_ARG_WITH(libs,
 AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
         getopt.h glob.h lastlog.h limits.h login.h \
         login_cap.h maillock.h netdb.h netgroup.h \
-        netinet/in_systm.h paths.h poll.h pty.h \
+        netinet/in_systm.h paths.h pty.h \
         rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
         strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
-        sys/mman.h sys/poll.h sys/select.h sys/stat.h \
+        sys/mman.h sys/select.h sys/stat.h \
         sys/stropts.h sys/sysmacros.h sys/time.h \
         sys/un.h time.h ttyent.h usersec.h \
         util.h utime.h utmp.h utmpx.h)
diff --git a/includes.h b/includes.h
index 633fd960e..df91404e8 100644
--- a/includes.h
+++ b/includes.h
@@ -85,13 +85,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef USE_PAM
 # include <security/pam_appl.h>
 #endif
-#ifdef HAVE_POLL_H
-# include <poll.h>
-#else
-# ifdef HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-# endif
-#endif
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>
 #endif