Merge lp:~zorba-coders/zorba/fix-build-mac into lp:zorba

[Matthias Brantner]

fix for build on mac

fix for build on mac

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-build-mac-2012-04-19T06-45-58.526Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix-build-mac-2012-04-19T06-45-58.526Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Paul J. Lucas (paul-lucas)]

Did you actually try this on a Mac? The preprocessor symbol is __APPLE__ and not APPLE.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-build-mac-2012-04-19T14-11-53.231Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix-build-mac-2012-04-19T14-11-53.231Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-04-18 11:34:17 +0000
+++ src/context/dynamic_context.cpp	2012-04-19 06:46:28 +0000
@@ -57,8 +57,11 @@
 using namespace std;
 
 #ifdef UNIX
-//external variables
 extern char **environ;
+#  ifdef APPLE
+#    include <crt_externs.h>
+#    define environ (*_NSGetEnviron())
+#  endif
 #endif
 
 namespace zorba