X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6d9dd8d922285bb78f6d5a77e428eedb8c1a5b3b..e7ce7665fd98a41e5b2c76643a58cdbc053ed41a:/lib/macros.c

diff --git a/lib/macros.c b/lib/macros.c
index f177ae0..4d3b9a0 100644
--- a/lib/macros.c
+++ b/lib/macros.c
@@ -350,9 +350,7 @@ static int mx__register(unsigned flags,
   e->args = args;
   e->callback = callback;
   e->definition = definition;
-  return hash_add(expansions, name, &e,
-                  ((flags & EXP_TYPE_MASK) == EXP_MACRO)
-                      ? HASH_INSERT : HASH_INSERT_OR_REPLACE);
+  return hash_add(expansions, name, &e, HASH_INSERT_OR_REPLACE);
 }
 
 /** @brief Register a simple expansion rule
@@ -394,11 +392,13 @@ int mx_register_macro(const char *name,
                       const struct mx_node *definition) {
   if(mx__register(EXP_MACRO, name, nargs, nargs, args,  0/*callback*/,
                   definition)) {
+#if 0
     /* This locates the error to the definition, which may be a line or two
      * beyond the @define command itself.  The backtrace generated by
      * mx_expand() may help more. */
     error(0, "%s:%d: duplicate definition of '%s'",
           definition->filename, definition->line, name);
+#endif
     return -2;
   }
   return 0;