fix fdisk llseek

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6144 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/util-linux/patches/100-compile_fix.patch b/package/util-linux/patches/100-llseek.patch
similarity index 61%
rename from package/util-linux/patches/100-compile_fix.patch
rename to package/util-linux/patches/100-llseek.patch
index ed5bfa683baf5a354ddcc5613dec02249b5eded3..51bd09d6ea23ae2c6efa841b1ff064af61ed2e9c 100644 (file)
--- 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__ */
+