From: Jürg Billeter Date: Sun, 4 Feb 2007 14:07:40 +0000 (+0000) Subject: fix global constants add NoArrayLength attribute to Process functions X-Git-Tag: VALA_0_0_6~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a7e098c96283912e09f5b5bf2f81b2640ea09f2;p=thirdparty%2Fvala.git fix global constants add NoArrayLength attribute to Process functions 2007-02-04 Jürg Billeter * vala/valaconstant.vala: fix global constants * vapi/glib-2.0.vala: add NoArrayLength attribute to Process functions svn path=/trunk/; revision=187 --- diff --git a/vala/ChangeLog b/vala/ChangeLog index 0cf6b55ed..afaea7e01 100644 --- a/vala/ChangeLog +++ b/vala/ChangeLog @@ -1,3 +1,8 @@ +2007-02-04 Jürg Billeter + + * vala/valaconstant.vala: fix global constants + * vapi/glib-2.0.vala: add NoArrayLength attribute to Process functions + 2007-02-04 Jürg Billeter * vala/valacodegenerator.vala: use correct type cname in array creation diff --git a/vala/vala/valaconstant.vala b/vala/vala/valaconstant.vala index e69c57859..868b11a12 100644 --- a/vala/vala/valaconstant.vala +++ b/vala/vala/valaconstant.vala @@ -93,7 +93,12 @@ public class Vala.Constant : Member, Lockable { cname = "%s_%s".printf (t.get_upper_case_cname (null), name); } else { var ns = (Namespace) symbol.parent_symbol.node; - cname = "%s%s".printf (ns.get_cprefix ().up (), name); + if (ns == null) { + // global constant + cname = name; + } else { + cname = "%s%s".printf (ns.get_cprefix ().up (), name); + } } } return cname; diff --git a/vala/vapi/glib-2.0.vala b/vala/vapi/glib-2.0.vala index 293741414..1bfe9d034 100644 --- a/vala/vapi/glib-2.0.vala +++ b/vala/vapi/glib-2.0.vala @@ -778,8 +778,11 @@ namespace GLib { [CCode (cprefix = "g_")] public struct Process { + [NoArrayLength ()] public static bool spawn_async_with_pipes (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, Pid child_pid, ref int standard_input, ref int standard_output, ref int standard_error, out Error error); + [NoArrayLength ()] public static bool spawn_async (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, Pid child_pid, out Error error); + [NoArrayLength ()] public static bool spawn_sync (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, out string standard_output, out string standard_error, ref int exit_status, out Error error); public static bool spawn_command_line_async (string! command_line, out Error error); public static bool spawn_command_line_sync (string! command_line, out string standard_output, out string standard_error, ref int exit_status, out Error error);