Zorba

Merge lp:~zorba-coders/zorba/environ-mac-fix into lp:zorba/process-module

  1. environ-mac-fix
  2. Merge into process-module
Proposed by Paul J. Lucas
Status: Merged
Approved by: Chris Hillery
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~zorba-coders/zorba/environ-mac-fix
Merge into: lp:zorba/process-module
Diff against target: 11 lines (+1/-0)
1 file modified
src/process-2.xq.src/process.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/environ-mac-fix
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Paul J. Lucas Approve
Review via email: mp+170732@code.launchpad.net

Commit message

Fix for Mac.

Description of the change

Fix for Mac.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/environ-mac-fix-2013-06-21T21-21-41.284Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job environ-mac-fix-2013-06-21T21-21-41.284Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/process-2.xq.src/process.cpp'
2--- src/process-2.xq.src/process.cpp 2013-06-13 11:27:11 +0000
3+++ src/process-2.xq.src/process.cpp 2013-06-21 03:40:32 +0000
4@@ -51,6 +51,7 @@
5 #ifndef WIN32
6 int execvpe(const char *program, char **argv, char **envp)
7 {
8+ extern char **environ;
9 char **saved = environ;
10 int rc;
11 environ = envp;

Subscribers

People subscribed via source and target branches

to all changes: