Mesa (master): glsl/glcpp: move macro declaration before code to fix MSVC build

[Brian Paul]

Module: Mesa
Branch: master
Commit: faa6b0cdc30c327871d7639ca3f1da5057d90d0a
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=faa6b0cdc30c327871d7639ca3f1da5057d90d0a

Author: Brian Paul <bri...@vmware.com>
Date:   Wed Jul  9 17:17:58 2014 -0600

glsl/glcpp: move macro declaration before code to fix MSVC build

Reviewed-by: Carl Worth <cwo...@cworth.org>

---

 src/glsl/glcpp/glcpp-parse.y |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 21c85b4..084078e 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -265,13 +265,14 @@ control_line:
 |      HASH_UNDEF {
                glcpp_parser_resolve_implicit_version(parser);
        } IDENTIFIER NEWLINE {
+               macro_t *macro;
                if (strcmp("__LINE__", $3) == 0
                    || strcmp("__FILE__", $3) == 0
                    || strcmp("__VERSION__", $3) == 0)
                        glcpp_error(& @1, parser, "Built-in (pre-defined)"
                                    " macro names can not be undefined.");
 
-               macro_t *macro = hash_table_find (parser->defines, $3);
+               macro = hash_table_find (parser->defines, $3);
                if (macro) {
                        hash_table_remove (parser->defines, $3);
                        ralloc_free (macro);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit