s/WARN_PREPROCESSOR/WARN_CPP/g (to stay somewhat compatible with gcc/clang warnings...

diff --git a/ftepp.c b/ftepp.c
index 054972efeca90115b0182b1e8c4f3ba85a31f6bb..11b446525968fabc19195ed0ef972135ce4b9d6e 100644 (file)
--- a/ftepp.c
+++ b/ftepp.c
@@ -481,7 +481,7 @@ static bool ftepp_define(ftepp_t *ftepp)
         case TOKEN_KEYWORD:
             macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
             if (macro && ftepp->output_on) {
         case TOKEN_KEYWORD:
             macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
             if (macro && ftepp->output_on) {

-                if (ftepp_warn(ftepp, WARN_PREPROCESSOR, "redefining `%s`", ftepp_tokval(ftepp)))
+                if (ftepp_warn(ftepp, WARN_CPP, "redefining `%s`", ftepp_tokval(ftepp)))

                     return false;
                 ftepp_macro_delete(ftepp, ftepp_tokval(ftepp));
             }
                     return false;
                 ftepp_macro_delete(ftepp, ftepp_tokval(ftepp));
             }

diff --git a/opts.c b/opts.c
index 91b9369735c62b8ac7ffa924cf9a340a101ba7e6..f96de4d285cfad73936ec6e37eb83cab938a1527 100644 (file)
--- a/opts.c
+++ b/opts.c
@@ -46,7 +46,7 @@ static void opts_setdefault() {
     opts_set(opts.warn,  WARN_EFFECTLESS_STATEMENT,      true);
     opts_set(opts.warn,  WARN_END_SYS_FIELDS,            true);
     opts_set(opts.warn,  WARN_ASSIGN_FUNCTION_TYPES,     true);
     opts_set(opts.warn,  WARN_EFFECTLESS_STATEMENT,      true);
     opts_set(opts.warn,  WARN_END_SYS_FIELDS,            true);
     opts_set(opts.warn,  WARN_ASSIGN_FUNCTION_TYPES,     true);

-    opts_set(opts.warn,  WARN_PREPROCESSOR,              true);
+    opts_set(opts.warn,  WARN_CPP,                       true);

     opts_set(opts.warn,  WARN_MULTIFILE_IF,              true);
     opts_set(opts.warn,  WARN_DOUBLE_DECLARATION,        true);
     opts_set(opts.warn,  WARN_CONST_VAR,                 true);
     opts_set(opts.warn,  WARN_MULTIFILE_IF,              true);
     opts_set(opts.warn,  WARN_DOUBLE_DECLARATION,        true);
     opts_set(opts.warn,  WARN_CONST_VAR,                 true);

diff --git a/opts.def b/opts.def
index ca91bf47648a64d354b5cf62e3c6abf302cefc40..da602180755071db8abb0c56f04a1faea99aad8d 100644 (file)
--- a/opts.def
+++ b/opts.def
@@ -72,7 +72,7 @@
     GMQCC_DEFINE_FLAG(EFFECTLESS_STATEMENT)
     GMQCC_DEFINE_FLAG(END_SYS_FIELDS)
     GMQCC_DEFINE_FLAG(ASSIGN_FUNCTION_TYPES)
     GMQCC_DEFINE_FLAG(EFFECTLESS_STATEMENT)
     GMQCC_DEFINE_FLAG(END_SYS_FIELDS)
     GMQCC_DEFINE_FLAG(ASSIGN_FUNCTION_TYPES)

-    GMQCC_DEFINE_FLAG(PREPROCESSOR)
+    GMQCC_DEFINE_FLAG(CPP)

     GMQCC_DEFINE_FLAG(MULTIFILE_IF)
     GMQCC_DEFINE_FLAG(DOUBLE_DECLARATION)
     GMQCC_DEFINE_FLAG(CONST_VAR)
     GMQCC_DEFINE_FLAG(MULTIFILE_IF)
     GMQCC_DEFINE_FLAG(DOUBLE_DECLARATION)
     GMQCC_DEFINE_FLAG(CONST_VAR)