- (stevesk) remove configure support for poll.h; it was removed

   from sshd.c a long time ago.

diff --git a/ChangeLog b/ChangeLog
index 04e572b1e6027f570b97024456368e66bc8531ff..3d5d81ff176b918cb059c8557e55fd86f5e4cdad 100644 (file)
--- 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 

diff --git a/configure.ac b/configure.ac
index 637a3030c59210f65898e084b69ac50f8e76a446..ef5bf7b2ca2d3f6175d45ae278b6471b4aeb3e4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 633fd960eb4cd231f7d8409bd79379aa07bd8d6e..df91404e8ce9bfd776fa771e335633faf368b83a 100644 (file)
--- 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