ChangeLog, ext2fs.h:

  ext2fs.h: Add kludge to deal with the fact that egcs cpp doesn't seem
  	to handle ~0UL the same way as they used to.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index d721db9..d3d3209 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-26    <tytso@valinux.com>
+
+       * ext2fs.h: Add kludge to deal with the fact that egcs cpp doesn't
+               seem to handle ~0UL the same way as they used to.
+
 1999-10-25    <tytso@valinux.com>
 
        * nt_io.c (_OpenNtName): Open the device using

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index ec7d29f..ddf264c 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -45,7 +45,8 @@
 #include "e2_types.h"
 #else
 #include <asm/types.h>
-#if (defined(__GNUC__) && defined(__STRICT_ANSI__) && ((~0UL) == 0xffffffff))
+#if defined(__GNUC__) && defined(__STRICT_ANSI__) && \
+       ((~0UL) == 0xffffffff) || defined(__i386__)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif