diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-28 21:40:02 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-28 21:40:02 +0000 |
| commit | 437121f9634fdcb12ed229b2dfed4e938ca5d67a (patch) | |
| tree | 5875d7f331c28075a243a260f64e91183947205c /openwrt/package/nfs-server/patches/gcc-3.4-fix.patch | |
| parent | 21af0abc3dd71707d8d9ce1e47720825cc559bc1 (diff) | |
fix nfs-server with gcc 3.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@751 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/nfs-server/patches/gcc-3.4-fix.patch')
| -rw-r--r-- | openwrt/package/nfs-server/patches/gcc-3.4-fix.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/openwrt/package/nfs-server/patches/gcc-3.4-fix.patch b/openwrt/package/nfs-server/patches/gcc-3.4-fix.patch new file mode 100644 index 0000000000..21915ce497 --- /dev/null +++ b/openwrt/package/nfs-server/patches/gcc-3.4-fix.patch @@ -0,0 +1,24 @@ +diff -urN nfs-server-2.2beta47.old/fh.c nfs-server-2.2beta47.dev/fh.c +--- nfs-server-2.2beta47.old/fh.c 2005-04-29 00:37:48.000000000 +0200 ++++ nfs-server-2.2beta47.dev/fh.c 2005-04-29 00:39:44.000000000 +0200 +@@ -351,13 +351,13 @@ + #ifndef ENABLE_DEVTAB + psi_t dmajor, dminor; + +-#if (SIZEOF_DEV_T == 4) +- /* This folds the upper 16 bits into bits 8..15, and +- * the lower 16 bits into bits 0..7 +- */ +- dev = (((dev >> 16) & 0xff00) ^ ((dev >> 8) & 0xff00)) | +- (((dev >> 8) & 0xff) ^ (dev & 0xff)); +-#endif ++ if (sizeof(dev_t) == 4) { ++ /* This folds the upper 16 bits into bits 8..15, and ++ * the lower 16 bits into bits 0..7 ++ */ ++ dev = (((dev >> 16) & 0xff00) ^ ((dev >> 8) & 0xff00)) | ++ (((dev >> 8) & 0xff) ^ (dev & 0xff)); ++ } + + /* + * Assuming major and minor numbers are small integers, |