diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-26 01:01:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-26 01:01:07 +0000 |
| commit | 4d25ed13f9389833a519140522c6b4fc9c421b31 (patch) | |
| tree | 1fe2a1db3ffdc75f5eca61807c8053ca01d2b1de /libs/pbd | |
| parent | 25024467b97d2bf3f7a06358bde107ada4d4db41 (diff) | |
really fix conflicts in epa.cc
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8572 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/epa.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libs/pbd/epa.cc b/libs/pbd/epa.cc index a12dc961a9..3b6066d9f1 100644 --- a/libs/pbd/epa.cc +++ b/libs/pbd/epa.cc @@ -61,25 +61,17 @@ void EnvironmentalProtectionAgency::save () { /* do this to avoid lots of calls to _NSGetEnviron() on OS X */ + char** the_environ = environ; e.clear (); -<<<<<<< .mine - for (size_t i = 0; the_environ[i]; ++i) { -======= if (!_envname.empty()) { /* fetch environment from named environment variable, rather than "environ" */ ->>>>>>> .r8570 -<<<<<<< .mine - string estring = the_environ[i]; - string::size_type equal = estring.find_first_of ('='); -======= const char* estr = getenv (_envname.c_str()); ->>>>>>> .r8570 if (!estr) { return; @@ -112,9 +104,9 @@ EnvironmentalProtectionAgency::save () /* fetch environment from "environ" */ - for (size_t i = 0; environ[i]; ++i) { + for (size_t i = 0; the_environ[i]; ++i) { - string estring = environ[i]; + string estring = the_environ[i]; string::size_type equal = estring.find_first_of ('='); if (equal == string::npos) { |