Dmitrijs Ledkovs has proposed merging lp:~xnox/upstart/fix-ftbfs-externs into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~xnox/upstart/fix-ftbfs-externs/+merge/147590 we really should i agree on how to handle global vars / externs. As currently anything that is declared in main.c cannot be extern in the rest of the files, as then tests will fail to link as demonstrated below. -- https://code.launchpad.net/~xnox/upstart/fix-ftbfs-externs/+merge/147590 Your team Upstart Reviewers is requested to review the proposed merge of lp:~xnox/upstart/fix-ftbfs-externs into lp:upstart.
=== modified file 'init/job_process.c' --- init/job_process.c 2013-02-08 16:55:25 +0000 +++ init/job_process.c 2013-02-11 03:30:31 +0000 @@ -115,6 +115,14 @@ **/ int disable_job_logging = 0; +/** + * inherit_env: + * + * If TRUE, copy init's environment to that provided to jobs. + **/ +int inherit_env = FALSE; + + /* Prototypes for static functions */ static void job_process_kill_timer (Job *job, NihTimer *timer); static void job_process_terminated (Job *job, ProcessType process, @@ -129,7 +137,6 @@ static void job_process_trace_exec (Job *job, ProcessType process); extern int user_mode; -extern int inherit_env; extern char *control_server_address; /** === modified file 'init/main.c' --- init/main.c 2013-02-09 03:43:09 +0000 +++ init/main.c 2013-02-11 03:30:31 +0000 @@ -120,13 +120,7 @@ **/ static int disable_startup_event = FALSE; -/** - * inherit_env: - * - * If TRUE, copy init's environment to that provided to jobs. - **/ -int inherit_env = FALSE; - +extern int inherit_env; extern int user_mode; extern int disable_sessions; extern int disable_job_logging;
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
