ChangeLog, mke2fs.c:
mke2fs.c (PRS): Use __u64 instead of long long for portability
reasons.
Moved #include of sys/stat.h inside #ifdef HAVE_LINUX_MAJOR_H for
portability reasons.
ChangeLog, util.c:
util.c: For NT portability, don't redefine getchar(), since stdio
defines that. Instead we introduce a new abstract macro read_a_char()
which is #defined to the right function as necessary.
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 39f35c2..c94de21 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,10 @@
1999-10-25 <tytso@valinux.com>
+ * util.c: For NT portability, don't redefine getchar(), since
+ stdio defines that. Instead we introduce a new
+ abstract macro read_a_char() which is #defined to the
+ right function as necessary.
+
* problem.c, problem.h (PR_2_NULL_NAME): Add new problem code.
* pass2.c (check_dir_block): Require that the length of the
diff --git a/e2fsck/util.c b/e2fsck/util.c
index a124a0f..fdba677 100644
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -17,11 +17,14 @@
#ifdef HAVE_CONIO_H
#undef HAVE_TERMIOS_H
#include <conio.h>
-#define getchar() getch()
+#define read_a_char() getch()
#else
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
+#else /* !HAVE_CONIO_H */
+#include <stdio.h>
+#define read_a_char getchar()
#endif
#ifdef HAVE_MALLOC_H
@@ -86,7 +89,7 @@
printf("%s%s? ", string, defstr);
while (1) {
fflush (stdout);
- if ((c = getchar()) == EOF)
+ if ((c = read_a_char()) == EOF)
break;
c = toupper(c);
if (c == 'Y') {