commit 85481739564591c6e6e0edeabc249acd11f3b494
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Sat May 8 18:31:11 2010 +0300

    Avoid name clashes.
    
    * mfd/snarf.m4 (MF_VAR_SET_STRING): Prefix local variables with
    a double-underscore to avoid name clashes with the existing variables.

diff --git a/mfd/snarf.m4 b/mfd/snarf.m4
index c3896d6..2b167e9 100644
--- a/mfd/snarf.m4
+++ b/mfd/snarf.m4
@@ -512,13 +512,13 @@ m4_define([<MF_VAR_REF>],[<m4_dnl
 
 /* MF_VAR_SET_STRING(name, value) - Set variable NAME to the string VALUE */
 m4_define([<MF_VAR_SET_STRING>],[<
-{ size_t off;
-  const char *s = $2;
-  if (s)
-     MF_COPY_STRING(off, s);
+{ size_t __off;
+  const char *__s = $2;
+  if (__s)
+     MF_COPY_STRING(__off, __s);
   else
-     off = 0;
-  MF_VAR_REF($1, off); }
+     __off = 0;
+  MF_VAR_REF($1, __off); }
 >])
 
 /* MF_VAR_INC(name) - Increment the value of the global variable NAME