Another hardcoded -std=gmqcc option removed and added to the implied -std=gmqcc flags

diff --git a/main.c b/main.c
index 6d8bc933c0ae267260eefc24af54f28353aea84e..f659e4776dd292a5af167644fc9262cd0bbf48c1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -163,6 +163,7 @@ static bool options_parse(int argc, char **argv) {
                     opts_set(opts.flags, FALSE_EMPTY_STRINGS,           false);
                     opts_set(opts.flags, TRUE_EMPTY_STRINGS,            true);
                     opts_set(opts.flags, LOOP_LABELS,                   true);
+                    opts_set(opts.flags, INITIALIZED_NONCONSTANTS,      true);
                     opts_set(opts.werror, WARN_INVALID_PARAMETER_COUNT, true);
                     opts_set(opts.werror, WARN_MISSING_RETURN_VALUES,   true);
                     opts.standard = COMPILER_GMQCC;

diff --git a/parser.c b/parser.c
index f6295947f4435a4c5fd6aefc47dd54a77db622e7..ce1b212071b3910e2c9fb868e46f2b74f73c37ea 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -4892,8 +4892,7 @@ skipvar:
                 }
                 else
                 {
-                    if (opts.standard != COMPILER_GMQCC &&
-                        !OPTS_FLAG(INITIALIZED_NONCONSTANTS) &&
+                    if (!OPTS_FLAG(INITIALIZED_NONCONSTANTS) &&
                         qualifier != CV_VAR)
                     {
                         var->cvq = CV_CONST;