* device/include/pic16/pic18fregs.h, src/pic16/devices.inc,

[fw/sdcc] / support / cpp2 / cppmacro.c

diff --git a/support/cpp2/cppmacro.c b/support/cpp2/cppmacro.c
index e630850106ab94fea5724e4a8d625a49f6363056..ed02b2ab2842b368d9a69a57a97016ee14c6089c 100644 (file)
--- a/support/cpp2/cppmacro.c
+++ b/support/cpp2/cppmacro.c
@@ -1184,8 +1184,10 @@ warn_of_redefinition (pfile, node, macro2)
   if (node->flags & NODE_WARN)
     return 1;
 
+#if 0
   if (! CPP_PEDANTIC (pfile))
     return 0;
+#endif
 
   /* Redefinition of a macro is allowed if and only if the old and new
      definitions are the same.  (6.10.3 paragraph 2). */
@@ -1418,7 +1420,8 @@ _cpp_create_definition (pfile, node)
              macro->count--;
            }
          /* Let assembler get away with murder.  */
-         else if (CPP_OPTION (pfile, lang) != CLK_ASM)
+         else if ((CPP_OPTION (pfile, lang) != CLK_ASM)
+               && (!CPP_OPTION(pfile, allow_naked_hash)))
            {
              ok = 0;
              cpp_error (pfile, "'#' is not followed by a macro parameter");