From: stevesk <stevesk>
Date: Sun, 7 Apr 2002 18:12:03 +0000 (+0000)
Subject:  - (stevesk) remove configure support for poll.h; it was removed
X-Git-Tag: PRE_SW_KRBV~16
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/a90419b8f1d863a7ad00d2654d863a0cf4b8fe65

 - (stevesk) remove configure support for poll.h; it was removed
   from sshd.c a long time ago.
---

diff --git a/ChangeLog b/ChangeLog
index 04e572b1..3d5d81ff 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 
diff --git a/configure.ac b/configure.ac
index 637a3030..ef5bf7b2 100644
--- 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 633fd960..df91404e 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