From 02bac350ebb2bdea902df9eeb4af4f8d9f63b13e Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Sat, 22 Jan 2011 19:43:14 -0600
Subject: [PATCH] Avoid collisions in generated variable usage.

* generator/CallbackGen.cs: s/result/__result/ for temporary callback
return values in the native invoker generation.
---
 generator/CallbackGen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs
index 9bbf61b24..b293f5127 100644
--- a/generator/CallbackGen.cs
+++ b/generator/CallbackGen.cs
@@ -173,10 +173,10 @@ namespace GtkSharp.Generation {
 			if (retval.IsVoid)
 				sw.WriteLine ("\t\t\t" + call + ";");
 			else
-				sw.WriteLine ("\t\t\t" + retval.CSType + " result = " + retval.FromNative (call) + ";");
+				sw.WriteLine ("\t\t\t" + retval.CSType + " __result = " + retval.FromNative (call) + ";");
 			body.Finish (sw, String.Empty);
 			if (!retval.IsVoid)
-				sw.WriteLine ("\t\t\treturn result;");
+				sw.WriteLine ("\t\t\treturn __result;");
 			sw.WriteLine ("\t\t}");
 			sw.WriteLine ("\t}");
 			sw.WriteLine ();