--- cfengine-2.1.15/src/globals.c.orig	2005-05-29 12:34:15.000000000 +0200
+++ cfengine-2.1.15/src/globals.c	2006-03-27 17:29:02.656250000 +0200
@@ -830,7 +830,7 @@
   /*
    * HvB: Bas van der Vlies
   */
-  PRIVATE flag MOUNT_RO = false;
+  PRIVATE flag CF_MOUNT_RO = false; 
 
   PRIVATE char *COMMATTRIBUTES[] =
      {
--- cfengine-2.1.15/src/install.c.orig	2006-03-27 17:27:53.828125000 +0200
+++ cfengine-2.1.15/src/install.c	2006-03-27 17:29:12.343750000 +0200
@@ -826,7 +826,7 @@
    case cfreadonly: 
        if ((strcmp(value,"on")==0) || (strcmp(value,"true")==0))
           {
-          MOUNT_RO=true;
+          CF_MOUNT_RO=true;
           }
        break; 
        
@@ -2590,7 +2590,7 @@
 
    /* HvB: Bas van der Vlies */
    case mountables:
-       InstallMountableItem(CURRENTOBJECT,MOUNTOPTS,MOUNT_RO);
+       InstallMountableItem(CURRENTOBJECT,MOUNTOPTS,CF_MOUNT_RO);
        break;
 
    case misc_mounts:
--- cfengine-2.1.15/src/parse.c.orig	2006-03-27 17:28:04.687500000 +0200
+++ cfengine-2.1.15/src/parse.c	2006-03-27 17:29:20.687500000 +0200
@@ -1289,7 +1289,7 @@
  /* 
   * HvB: Bas van der Vlies
  */
- MOUNT_RO=false;
+ CF_MOUNT_RO=false;
  MOUNTOPTS[0]='\0';
  
  /* Make sure we don't clean the buffer in the middle of a link! */
--- cfengine-2.1.15/src/cf.extern.h.orig	2006-03-27 17:28:13.546875000 +0200
+++ cfengine-2.1.15/src/cf.extern.h	2006-03-27 17:29:27.203125000 +0200
@@ -269,7 +269,7 @@
 extern char *PARSEMETHODRETURNCLASSES;
 
 extern struct Item *METHODARGS;
-extern flag  MOUNT_RO;                  /* mount directory readonly */
+extern flag  CF_MOUNT_RO;                  /* mount directory readonly */
 
 extern struct Item *VALERTS;
 extern struct Item *VMOUNTED;