wok diff busybox/stuff/busybox-1.20-nfs-segfault.u @ rev 13847

frogatto: try to fix build (Boost 1.47 removed a deprecated function...) btw, we use boost 1.50
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Jan 09 01:13:47 2013 +0000 (2013-01-09)
parents 77850ece4ff6
children
line diff
     1.1 --- a/busybox/stuff/busybox-1.20-nfs-segfault.u	Fri Dec 21 02:27:20 2012 +0000
     1.2 +++ b/busybox/stuff/busybox-1.20-nfs-segfault.u	Wed Jan 09 01:13:47 2013 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  --- a/util-linux/mount.c
     1.5  +++ b/util-linux/mount.c
     1.6 -@@ -285,9 +285,6 @@
     1.7 +@@ -320,9 +320,6 @@
     1.8   
     1.9   
    1.10   struct globals {
    1.11 @@ -10,7 +10,7 @@
    1.12   #if ENABLE_FEATURE_MOUNT_VERBOSE
    1.13   	unsigned verbose;
    1.14   #endif
    1.15 -@@ -296,7 +293,7 @@
    1.16 +@@ -331,7 +328,7 @@
    1.17   } FIX_ALIASING;
    1.18   enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
    1.19   #define G (*(struct globals*)&bb_common_bufsiz1)
    1.20 @@ -19,19 +19,21 @@
    1.21   #if ENABLE_FEATURE_MOUNT_VERBOSE
    1.22   #define verbose           (G.verbose          )
    1.23   #else
    1.24 -@@ -937,6 +934,7 @@
    1.25 +@@ -972,7 +969,8 @@
    1.26   static void
    1.27   find_kernel_nfs_mount_version(void)
    1.28   {
    1.29 +-	int kernel_version;
    1.30  +#if 0
    1.31 - 	int kernel_version;
    1.32 ++		int kernel_version;
    1.33   
    1.34   	if (nfs_mount_version)
    1.35 -@@ -950,6 +948,7 @@
    1.36 + 		return;
    1.37 +@@ -985,6 +983,7 @@
    1.38   			nfs_mount_version = 3;
    1.39   		/* else v4 since 2.3.99pre4 */
    1.40   	}
    1.41 -+#endif
    1.42 ++#endif	
    1.43   }
    1.44   
    1.45 - static void
    1.46 \ No newline at end of file
    1.47 + static void