From: Stelian Pop <stelian@popies.net>
Date: Wed, 2 Jun 2004 09:22:48 +0000 (+0000)
Subject: Fix compilation on AMD64
X-Git-Tag: release_0_4b38~18
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b3f5553293aa24cb18b0de9a6a3ee86053c23ca2;p=dump.git

Fix compilation on AMD64
---

diff --git a/CHANGES b/CHANGES
index 12efb5a..83cad50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.248 2004/05/24 12:39:23 stelian Exp $
+$Id: CHANGES,v 1.249 2004/06/02 09:22:48 stelian Exp $
 
 Changes between versions 0.4b36 and 0.4b37 (released ??????????????)
 ====================================================================
@@ -12,6 +12,11 @@ Changes between versions 0.4b36 and 0.4b37 (released ??????????????)
 	better not to have to rely on an extra filesystem.
 	Thanks to Bdale Garbee <bdale@gag.com> for the suggestion.
 
+2.	Fix compilation on (at least the Linux Debian port to) AMD64.
+	(<ext2fs/ext2_types.h> defines some types (__s64 and __u64)
+	that are also defined by <linux/types.h> (<asm/types.h>) and 
+	they conflict).
+
 Changes between versions 0.4b35 and 0.4b36 (released April 21, 2004)
 ====================================================================
 
diff --git a/dump/main.c b/dump/main.c
index cecaaae..fec91af 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.92 2004/04/21 08:55:51 stelian Exp $";
+	"$Id: main.c,v 1.93 2004/06/02 09:22:49 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -58,6 +58,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <time.h>
 #ifdef __linux__
+#include <linux/types.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else