- (djm) Misc NeXT fixes from Ben Lindstrom <mouring@pconline.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a06f8d9ba..b73255a21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
  - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known
    to compile on more platforms (incl NeXT).
  - (djm) Added bsd-inet_aton and configure support for NeXT
+ - (djm) Misc NeXT fixes from Ben Lindstrom <mouring@pconline.com>
 
 20000709
  - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
diff --git a/TODO b/TODO
index 6542e7000..1d46ae1c3 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,4 @@
   seem to act correctly.  Ctrl-C and Ctrl-Z don't return echo to the
   underlying shell.
 
-- scp is broken under NeXT, and will need some TLC to be portable to
-  such an old platform. "struct dirent" does not exist, and under
-  next those functions take a single integer input.
+- utmp/wtmp logging does not work on NeXT
diff --git a/includes.h b/includes.h
index 716d02f31..2f3a56ec6 100644
--- a/includes.h
+++ b/includes.h
@@ -54,7 +54,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif 
-#ifdef HAVE_NETDB_H
+#if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT)
+/* Next includes this as part of another header */
 # include <netdb.h>
 #endif 
 #ifdef HAVE_ENDIAN_H