Skip to content

Commit

Permalink
Fixed compilation error on Mac that was caused by undefined variable
Browse files Browse the repository at this point in the history 
environ
  • Loading branch information
@jonjove
jonjove committed Nov 1, 2017
1 parent b5bcdbd commit fea5fc5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/process/ProcessManagerImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#include <regex>
#include <string>

#ifdef __APPLE__
extern char **environ;
#endif

namespace stellar
{

Expand Down

5 comments on commit fea5fc5

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from MonsieurNicolas
at jonjove@fea5fc5

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jonjove/stellar-core/mac-fix-environ = fea5fc5 into auto

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jonjove/stellar-core/mac-fix-environ = fea5fc5 merged ok, testing candidate = 631687e

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: https://travis-ci.org/stellar/stellar-core/builds/295934848?utm_source=github_status&utm_medium=notification

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 631687e

Please sign in to comment.