diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | includes.h | 7 |
3 files changed, 6 insertions, 11 deletions
@@ -5,6 +5,8 @@ | |||
5 | and no fd passing support. | 5 | and no fd passing support. |
6 | - (stevesk) HAVE_MMAP and HAVE_SYS_MMAN_H and use them in | 6 | - (stevesk) HAVE_MMAP and HAVE_SYS_MMAN_H and use them in |
7 | monitor_mm.c | 7 | monitor_mm.c |
8 | - (stevesk) remove configure support for poll.h; it was removed | ||
9 | from sshd.c a long time ago. | ||
8 | 10 | ||
9 | 20020406 | 11 | 20020406 |
10 | - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann | 12 | - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann |
@@ -8195,4 +8197,4 @@ | |||
8195 | - Wrote replacements for strlcpy and mkdtemp | 8197 | - Wrote replacements for strlcpy and mkdtemp |
8196 | - Released 1.0pre1 | 8198 | - Released 1.0pre1 |
8197 | 8199 | ||
8198 | $Id: ChangeLog,v 1.2036 2002/04/07 17:08:53 stevesk Exp $ | 8200 | $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 @@ | |||
1 | # $Id: configure.ac,v 1.37 2002/04/07 17:08:54 stevesk Exp $ | 1 | # $Id: configure.ac,v 1.38 2002/04/07 18:12:04 stevesk Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -314,10 +314,10 @@ AC_ARG_WITH(libs, | |||
314 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ | 314 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ |
315 | getopt.h glob.h lastlog.h limits.h login.h \ | 315 | getopt.h glob.h lastlog.h limits.h login.h \ |
316 | login_cap.h maillock.h netdb.h netgroup.h \ | 316 | login_cap.h maillock.h netdb.h netgroup.h \ |
317 | netinet/in_systm.h paths.h poll.h pty.h \ | 317 | netinet/in_systm.h paths.h pty.h \ |
318 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 318 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
319 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ | 319 | strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ |
320 | sys/mman.h sys/poll.h sys/select.h sys/stat.h \ | 320 | sys/mman.h sys/select.h sys/stat.h \ |
321 | sys/stropts.h sys/sysmacros.h sys/time.h \ | 321 | sys/stropts.h sys/sysmacros.h sys/time.h \ |
322 | sys/un.h time.h ttyent.h usersec.h \ | 322 | sys/un.h time.h ttyent.h usersec.h \ |
323 | util.h utime.h utmp.h utmpx.h) | 323 | 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 } | |||
85 | #ifdef USE_PAM | 85 | #ifdef USE_PAM |
86 | # include <security/pam_appl.h> | 86 | # include <security/pam_appl.h> |
87 | #endif | 87 | #endif |
88 | #ifdef HAVE_POLL_H | ||
89 | # include <poll.h> | ||
90 | #else | ||
91 | # ifdef HAVE_SYS_POLL_H | ||
92 | # include <sys/poll.h> | ||
93 | # endif | ||
94 | #endif | ||
95 | #ifdef HAVE_SYS_SYSMACROS_H | 88 | #ifdef HAVE_SYS_SYSMACROS_H |
96 | # include <sys/sysmacros.h> | 89 | # include <sys/sysmacros.h> |
97 | #endif | 90 | #endif |