From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 27 Jan 2008 05:35:32 +0000 (-0500)
Subject: Use lseek() instead of llseek() of sizeof(long) == sizeof(long long)
X-Git-Tag: v1.40.5~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2dbc18a9425815b6e93eb8b95d05a1168fb6e23;p=thirdparty%2Fe2fsprogs.git

Use lseek() instead of llseek() of sizeof(long) == sizeof(long long)

Previously we used a hard-coded test where for the Alpha and the IA64,
we used lseek instead of llseek().  Generalize this to whenver
sizeof(long) is the same as sizeof(long long).

It turns out this fixes a FTBFS problem on the x86_64 for Debian,
since dietlibc doesn't provide llseek() on that architecture.

Addresses-Debian-Bug: #459614

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c
index 4f49052e5..5bd0e5167 100644
--- a/lib/blkid/llseek.c
+++ b/lib/blkid/llseek.c
@@ -45,11 +45,11 @@ extern long long llseek(int fd, long long offset, int origin);
 
 #else	/* ! HAVE_LLSEEK */
 
-#if defined(__alpha__) || defined(__ia64__)
+#if SIZEOF_LONG == SIZEOF_LONG_LONG
 
 #define llseek lseek
 
-#else /* !__alpha__ && !__ia64__*/
+#else /* SIZEOF_LONG != SIZEOF_LONG_LONG */
 
 #include <linux/unistd.h>
 
diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index aa4f54d4c..5a5e560bb 100644
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -46,11 +46,11 @@ extern long long llseek (int fd, long long offset, int origin);
 
 #else	/* ! HAVE_LLSEEK */
 
-#if defined(__alpha__) || defined (__ia64__)
+#if SIZEOF_LONG == SIZEOF_LONG_LONG
 
 #define llseek lseek
 
-#else /* !__alpha__ && !__ia64__*/
+#else /* SIZEOF_LONG != SIZEOF_LONG_LONG */
 
 #include <linux/unistd.h>