From: Wolfgang Bumiller <blub@speed.at>
Date: Mon, 31 Dec 2012 11:43:15 +0000 (+0100)
Subject: Another hardcoded -std=gmqcc option removed and added to the implied -std=gmqcc flags
X-Git-Tag: before-library~407
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=0920cb6ec4e1a00af744d1c33a4f0b44de33a3fa

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

diff --git a/main.c b/main.c
index 6d8bc93..f659e47 100644
--- 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 f629594..ce1b212 100644
--- 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;