From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 1 Mar 2010 08:27:01 +0000 (+0100)
Subject: Rename _main to _vala_main to avoid conflicts
X-Git-Tag: 0.8.0~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45600dbbc6bba9e252dbae27320c3b6942c30420;p=thirdparty%2Fvala.git

Rename _main to _vala_main to avoid conflicts

Fixes bug 582540.
---

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 17775ab88..979dcad1e 100644
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -367,7 +367,7 @@ public class Vala.Method : Member {
 	public virtual string get_default_cname () {
 		if (name == "main" && parent_symbol.name == null) {
 			// avoid conflict with generated main function
-			return "_main";
+			return "_vala_main";
 		} else if (name.has_prefix ("_")) {
 			return "_%s%s".printf (parent_symbol.get_lower_case_cprefix (), name.offset (1));
 		} else {