Applied patch from Larry Doolittle to use preprocessor for defining

NFS_MOUNT_VERSION.

diff --git a/nfsmount.c b/nfsmount.c
index d661a99a42c0f750590fc58b769df2c18ce036e2..b260a885f3faa2eb2dff475d6910701997423562 100644 (file)
--- a/nfsmount.c
+++ b/nfsmount.c
@@ -93,7 +93,9 @@ static const int MS_NODIRATIME = 2048;    /* Do not update directory access time
  * so it is easiest to ignore the kernel altogether (at compile time).
  */
 
-static const int NFS_MOUNT_VERSION = 4;
+/* NOTE: Do not make this into a 'static const int' because the pre-processor
+ * needs to test this value in some #if statements. */
+#define NFS_MOUNT_VERSION 4
 
 struct nfs2_fh {
         char                    data[32];

diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index d661a99a42c0f750590fc58b769df2c18ce036e2..b260a885f3faa2eb2dff475d6910701997423562 100644 (file)
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -93,7 +93,9 @@ static const int MS_NODIRATIME = 2048;    /* Do not update directory access time
  * so it is easiest to ignore the kernel altogether (at compile time).
  */
 
-static const int NFS_MOUNT_VERSION = 4;
+/* NOTE: Do not make this into a 'static const int' because the pre-processor
+ * needs to test this value in some #if statements. */
+#define NFS_MOUNT_VERSION 4
 
 struct nfs2_fh {
         char                    data[32];