vala r1051 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sun Feb 24 15:49:11 2008
New Revision: 1051
URL: http://svn.gnome.org/viewvc/vala?rev=1051&view=rev

Log:
2008-02-24  Juerg Billeter  <j bitron ch>

	* vala/valamethod.vala: support main function in root namespace,
	  fixes bug 516950


Modified:
   trunk/ChangeLog
   trunk/vala/valamethod.vala

Modified: trunk/vala/valamethod.vala
==============================================================================
--- trunk/vala/valamethod.vala	(original)
+++ trunk/vala/valamethod.vala	Sun Feb 24 15:49:11 2008
@@ -296,7 +296,10 @@
 	 * @return the name to be used in C code by default
 	 */
 	public virtual string! get_default_cname () {
-		if (name.has_prefix ("_")) {
+		if (name == "main" && parent_symbol.name == null) {
+			// avoid conflict with generated main function
+			return "_main";
+		} else if (name.has_prefix ("_")) {
 			return "_%s%s".printf (parent_symbol.get_lower_case_cprefix (), name.offset (1));
 		} else {
 			return "%s%s".printf (parent_symbol.get_lower_case_cprefix (), name);