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 4f49052e535b4e03e8e0aef79bebd042410981fb..5bd0e516782a81bb99ebbadbebc033a01d076a24 100644 (file)
--- 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 aa4f54d4c3589b85bdb2145ce8d96e0043d99fa2..5a5e560bb5b48e6a212e8fac9bd9b40d06d424f1 100644 (file)
--- 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>