diff -Nru /tmp/lCpPPFGOAC/e2fsprogs-1.38/debian/changelog /tmp/BGqrWpcST1/e2fsprogs-1.38/debian/changelog
--- /tmp/lCpPPFGOAC/e2fsprogs-1.38/debian/changelog	2006-01-07 13:22:10.315697500 -0500
+++ /tmp/BGqrWpcST1/e2fsprogs-1.38/debian/changelog	2006-01-07 13:22:10.691721000 -0500
@@ -1,3 +1,11 @@
+e2fsprogs (1.38-2ubuntu2) breezy; urgency=low
+
+  * Switched priority of detection of 64 bit data type from
+    long to long long to eliminate conflict with definitions
+    from asm/types.h on amd64
+
+ -- Phillip Susi <psusi@cfl.rr.com>  Sat,  7 Jan 2006 13:17:28 -0500
+
 e2fsprogs (1.38-2ubuntu1) breezy; urgency=low
 
   * Merge with Debian.  (Ubuntu #13757)
diff -Nru /tmp/lCpPPFGOAC/e2fsprogs-1.38/lib/ext2fs/ext2_types.h.in /tmp/BGqrWpcST1/e2fsprogs-1.38/lib/ext2fs/ext2_types.h.in
--- /tmp/lCpPPFGOAC/e2fsprogs-1.38/lib/ext2fs/ext2_types.h.in	2004-04-03 10:20:26.000000000 -0500
+++ /tmp/BGqrWpcST1/e2fsprogs-1.38/lib/ext2fs/ext2_types.h.in	2006-01-07 13:22:10.675720000 -0500
@@ -14,14 +14,14 @@
 typedef int		__s64;
 typedef unsigned int	__u64;
 #else
-#if (@SIZEOF_LONG@ == 8)
-typedef long		__s64;
-typedef unsigned long	__u64;
-#else
 #if (@SIZEOF_LONG_LONG@ == 8)
 #if defined(__GNUC__)
 typedef __signed__ long long 	__s64;
 #else
+#if (@SIZEOF_LONG@ == 8)
+typedef long		__s64;
+typedef unsigned long	__u64;
+#else
 typedef signed long long 	__s64;
 #endif /* __GNUC__ */
 typedef unsigned long long	__u64;