util.c:

  Fix stupid bugs in NT portability patch.
ChangeLog, configure, configure.in:
  Add termios.h to the headers which are checked.

diff --git a/ChangeLog b/ChangeLog
index c73786b..6ad0048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@
        * configure.in: Move the code that checks for the presence of
                Linux header files, to earlier in the config file, since
                it adds a directory to the include path, and that needs to
-               happen before any compile tests are run.
+               happen before any compile tests are run.  Add termios.h to
+               the headers which are checked.
 
 1999-10-25    <tytso@valinux.com>
 

diff --git a/configure b/configure
index 49aedbe..69bbee0 100644 (file)
--- a/configure
+++ b/configure
@@ -1913,7 +1913,7 @@ test -n "$BUILD_CC" && break
 done
 
 fi
-for ac_hdr in stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h
+for ac_hdr in stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 1c737e5..dfec9f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -340,7 +340,7 @@ if test $cross_compiling = no; then
 else
   AC_CHECK_PROGS(BUILD_CC, gcc cc)
 fi
-AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h)
+AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h)
 AC_FUNC_VPRINTF
 dnl
 dnl See if struct dirent has a d_namlen field (like bsd systems), implying

diff --git a/e2fsck/util.c b/e2fsck/util.c
index fdba677..8c07374 100644 (file)
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -22,9 +22,8 @@
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#else /* !HAVE_CONIO_H */
 #include <stdio.h>
-#define read_a_char    getchar()
+#define read_a_char()  getchar()
 #endif
 
 #ifdef HAVE_MALLOC_H