From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 11 Nov 2014 23:49:39 +0000 (+0200)
Subject: Eliminate conflicts with Windows headers
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=a005e42f923c3c9ea973b1d5ac283441104d8c17

Eliminate conflicts with Windows headers
---

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index 832d5898..a2d49ac8 100644
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -427,15 +427,15 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 		if(!(*i)->resolved_name.compare(0, 3, "gl_"))
 			continue;
 
-		InterfaceFlags interface = (*i)->get_interface_flags(scope);
+		InterfaceFlags iface = (*i)->get_interface_flags(scope);
 
-		if(interface&INPUT)
+		if(iface&INPUT)
 		{
 			const char *qualifier = (legacy_qualifiers ? scope==VERTEX ? "attribute" : "varying" : "in");
 			source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1]));
 		}
 
-		if(interface&OUTPUT)
+		if(iface&OUTPUT)
 		{
 			const char *qualifier = (legacy_qualifiers ? "varying" : "out");
 			source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope]));
@@ -454,8 +454,8 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 			Output variables are already declared. */
 			for(list<ShaderVariable *>::const_iterator j=loop_vars.begin(); j!=loop_vars.end(); ++j)
 			{
-				InterfaceFlags interface = (*j)->get_interface_flags(scope);
-				if(!(*j)->in_loop && !(interface&OUTPUT))
+				InterfaceFlags iface = (*j)->get_interface_flags(scope);
+				if(!(*j)->in_loop && !(iface&OUTPUT))
 					source += format("\t%s;\n", (*j)->create_declaration());
 			}
 
@@ -477,8 +477,8 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 					source += format("\t\t%s %s %s;\n", decl, oper, create_expression(**j, "i"));
 				}
 
-				InterfaceFlags interface = (*j)->get_interface_flags(scope);
-				if(interface&OUTPUT)
+				InterfaceFlags iface = (*j)->get_interface_flags(scope);
+				if(iface&OUTPUT)
 				{
 					string expr = ((*j)->inlined ? create_expression(**j, "i") : (*j)->resolved_name+"[i]");
 					source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr);
@@ -489,11 +489,11 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 			loop_vars.clear();
 		}
 
-		InterfaceFlags interface = (*i)->get_interface_flags(scope);
+		InterfaceFlags iface = (*i)->get_interface_flags(scope);
 
 		if((*i)->array_size>1)
 		{
-			if((*i)->variable->scope==scope || (interface&OUTPUT))
+			if((*i)->variable->scope==scope || (iface&OUTPUT))
 			{
 				loop_size = (*i)->array_size;
 				loop_vars.push_back(*i);
@@ -503,11 +503,11 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 
 		if((*i)->variable->scope==scope && !(*i)->inlined)
 		{
-			string decl = ((interface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration());
+			string decl = ((iface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration());
 			source += format("\t%s = %s;\n", decl, create_expression(**i));
 		}
 
-		if((interface&(OUTPUT|GOAL))==OUTPUT)
+		if((iface&(OUTPUT|GOAL))==OUTPUT)
 		{
 			string expr = ((*i)->inlined ? create_expression(**i) : (*i)->resolved_name);
 			source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr);
@@ -999,7 +999,7 @@ string ProgramBuilder::ShaderVariable::create_type_declaration() const
 	throw invalid_variable_definition("invalid typedef");
 }
 
-string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool loop) const
+string ProgramBuilder::ShaderVariable::create_declaration(char iface, bool loop) const
 {
 	if(variable->scope==UNIFORM && !array_subscript.empty())
 	{
@@ -1012,8 +1012,8 @@ string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool l
 	if(!array_sum && array_size>1 && !loop)
 		array = format("[%d]", array_size);
 
-	if(interface)
-		return format("%s %c_%s%s", variable->type, interface, resolved_name, array);
+	if(iface)
+		return format("%s %c_%s%s", variable->type, iface, resolved_name, array);
 	else
 		return format("%s %s%s", variable->type, resolved_name, array);
 }
@@ -1021,11 +1021,11 @@ string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool l
 string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, const char *loop) const
 {
 	string replacement = resolved_name;
-	InterfaceFlags interface = NO_INTERFACE;
+	InterfaceFlags iface = NO_INTERFACE;
 	if(variable)
 	{
-		interface = get_interface_flags(from_scope);
-		if((interface&INPUT) && interfaces[from_scope-1])
+		iface = get_interface_flags(from_scope);
+		if((iface&INPUT) && interfaces[from_scope-1])
 			replacement = format("%c_%s", interfaces[from_scope-1], replacement);
 		else if(inlined)
 		{
diff --git a/source/programbuilder.h b/source/programbuilder.h
index 43d43fcc..56fd5e80 100644
--- a/source/programbuilder.h
+++ b/source/programbuilder.h
@@ -124,7 +124,6 @@ private:
 		NO_INTERFACE = 0,
 		INPUT = 1,
 		OUTPUT = 2,
-		PASSTHROUGH = INPUT|OUTPUT,
 		GOAL = 4
 	};