*** empty log message ***

[gnu-emacs] / src / tparam.c

diff --git a/src/tparam.c b/src/tparam.c
index 5a9809aab47f7f239de5c54c9b3f9e7d979d5059..fb71e05b3e431d1a811bf5e33c7de222aa5cab18 100644 (file)
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -107,6 +107,9 @@ tparam (string, outstring, len, arg0, arg1, arg2, arg3)
   return tparam1 (string, outstring, len, NULL, NULL, arg);
 }
 
+/* These are already defined in the System framework in Mac OS X and
+   cause prebinding to fail.  */
+#ifndef MAC_OSX
 char *BC;
 char *UP;
 
@@ -124,6 +127,7 @@ tgoto (cm, hpos, vpos)
   args[1] = hpos;
   return tparam1 (cm, tgoto_buf, 50, UP, BC, args);
 }
+#endif
 
 static char *
 tparam1 (string, outstring, len, up, left, argp)
@@ -165,7 +169,7 @@ tparam1 (string, outstring, len, up, left, argp)
              outlen *= 2;
              new = (char *) xrealloc (outstring, outlen);
            }
-         
+
          op = new + offset;
          outend = new + outlen;
          outstring = new;