aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-20 15:00:31 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-20 15:00:31 +0000
commitee7132b9dfe0bec4c28952f60bf049a80a814e5a (patch)
tree8a1e8f4d7bcf0b0ed735e0a434eef5064833ddc4
parentcfaffb87a5180601c12bc0e99b3f912de4c718f6 (diff)
downloadupstream-ee7132b9dfe0bec4c28952f60bf049a80a814e5a.tar.gz
upstream-ee7132b9dfe0bec4c28952f60bf049a80a814e5a.tar.bz2
upstream-ee7132b9dfe0bec4c28952f60bf049a80a814e5a.zip
fix fdisk llseek
SVN-Revision: 6144
-rw-r--r--package/util-linux/patches/100-llseek.patch (renamed from package/util-linux/patches/100-compile_fix.patch)32
1 files changed, 32 insertions, 0 deletions
diff --git a/package/util-linux/patches/100-compile_fix.patch b/package/util-linux/patches/100-llseek.patch
index ed5bfa683b..51bd09d6ea 100644
--- a/package/util-linux/patches/100-compile_fix.patch
+++ b/package/util-linux/patches/100-llseek.patch
@@ -45,3 +45,35 @@ diff -ur util-linux.old/partx/partx.c util-linux.dev/partx/partx.c
#endif
static int
+diff -ur util-linux.old/fdisk/llseek.c util-linux.dev/fdisk/llseek.c
+--- util-linux.old/fdisk/llseek.c 2007-01-20 15:53:17.870636000 +0100
++++ util-linux.dev/fdisk/llseek.c 2007-01-20 15:55:33.458024160 +0100
+@@ -32,7 +32,7 @@
+ #ifndef __NR__llseek
+
+ /* no __NR__llseek on compilation machine - might give it explicitly */
+-static int _llseek (unsigned int fd, unsigned long oh,
++static int __llseek (unsigned int fd, unsigned long oh,
+ unsigned long ol, long long *result,
+ unsigned int origin) {
+ errno = ENOSYS;
+@@ -41,17 +41,8 @@
+
+ #endif
+
+-static long long my_llseek (unsigned int fd, long long offset,
+- unsigned int origin)
+-{
+- long long result;
+- int retval;
+-
+- retval = _llseek (fd, ((unsigned long long) offset) >> 32,
+- ((unsigned long long) offset) & 0xffffffff,
+- &result, origin);
+- return (retval == -1 ? (long long) retval : result);
+-}
++extern long long llseek(unsigned int fd, long long offset, unsigned int origin);
++#define my_llseek llseek
+
+ #endif /* __alpha__ */
+