Port nfs-server to -ng
[openwrt/svn-archive/archive.git] / net / nfs-server / patches / gcc-3.4-fix.patch
1 diff -urN nfs-server-2.2beta47.old/fh.c nfs-server-2.2beta47.dev/fh.c
2 --- nfs-server-2.2beta47.old/fh.c 2005-04-29 00:37:48.000000000 +0200
3 +++ nfs-server-2.2beta47.dev/fh.c 2005-04-29 00:39:44.000000000 +0200
4 @@ -351,13 +351,13 @@
5 #ifndef ENABLE_DEVTAB
6 psi_t dmajor, dminor;
7
8 -#if (SIZEOF_DEV_T == 4)
9 - /* This folds the upper 16 bits into bits 8..15, and
10 - * the lower 16 bits into bits 0..7
11 - */
12 - dev = (((dev >> 16) & 0xff00) ^ ((dev >> 8) & 0xff00)) |
13 - (((dev >> 8) & 0xff) ^ (dev & 0xff));
14 -#endif
15 + if (sizeof(dev_t) == 4) {
16 + /* This folds the upper 16 bits into bits 8..15, and
17 + * the lower 16 bits into bits 0..7
18 + */
19 + dev = (((dev >> 16) & 0xff00) ^ ((dev >> 8) & 0xff00)) |
20 + (((dev >> 8) & 0xff) ^ (dev & 0xff));
21 + }
22
23 /*
24 * Assuming major and minor numbers are small integers,