Update patch from drow for file.c kernel types

diff --git a/ChangeLog b/ChangeLog
index 575d33f257d5b15f0aeb0610a9d5e4ef5989f809..519941675fd4cd75aa0b5378dc2e5ba4e8559f41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul  9 02:28:16 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add a corrected patch from Daniel Jacobowitz
+
 Thu Jul  8 16:00:04 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Merge patch from Daniel Jacobowitz to allow us to use the kernel types

diff --git a/file.c b/file.c
index 2a7c8fbdea3e6f2ddfbb607b20e780d57321bc60..160c2ccfa367781e015a90f529cf07538dbccf3b 100644 (file)
--- a/file.c
+++ b/file.c
@@ -66,6 +66,15 @@ struct stat {
 #    include <asm/stat.h>
 #    undef stat
 #  else
+#    undef dev_t
+#    undef ino_t
+#    undef mode_t
+#    undef nlink_t
+#    undef uid_t
+#    undef gid_t
+#    undef off_t
+#    undef loff_t
+
 #    define dev_t __kernel_dev_t
 #    define ino_t __kernel_ino_t
 #    define mode_t __kernel_mode_t
@@ -85,6 +94,15 @@ struct stat {
 #    undef gid_t
 #    undef off_t
 #    undef loff_t
+
+#    define dev_t dev_t
+#    define ino_t ino_t
+#    define mode_t mode_t
+#    define nlink_t nlink_t
+#    define uid_t uid_t
+#    define gid_t gid_t
+#    define off_t off_t
+#    define loff_t loff_t
 #  endif
 #  define stat libc_stat
 #  include <sys/stat.h>