From: Brian Paul <brianp@vmware.com>
Date: Wed, 9 Jul 2014 23:17:58 +0000 (-0600)
Subject: glsl/glcpp: move macro declaration before code to fix MSVC build
X-Git-Tag: android-x86-4.4-r3~4390
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=faa6b0cdc30c327871d7639ca3f1da5057d90d0a;p=android-x86%2Fexternal-mesa.git

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

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

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 21c85b410f5..084078eb01f 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);