re PR ada/64349 (Bootstrapping Ada fails on darwin(9|10).)

2015-02-05  Tristan Gingold  <gingold@adacore.com>

	PR ada/64349
	* env.c: Fix thinko: handle Darwin case before default one.

From-SVN: r220437
This commit is contained in:
Tristan Gingold 2015-02-05 09:09:51 +00:00 committed by Arnaud Charlet
parent cc6a430fb2
commit aebab21a5b
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2015-02-05 Tristan Gingold <gingold@adacore.com>
PR ada/64349da/64349
* env.c: Fix thinko: handle Darwin case before default one.
2015-01-30 Robert Dewar <dewar@adacore.com>
* a-assert.adb: Minor reformatting.

View File

@ -214,11 +214,11 @@ __gnat_environ (void)
#elif defined (sun)
extern char **_environ;
return _environ;
#elif defined (__APPLE__) && !defined (__arm__)
return *_NSGetEnviron ();
#elif ! (defined (__vxworks))
extern char **environ;
return environ;
#elif defined (__APPLE__) && !defined (__arm__)
return *_NSGetEnviron ();
#else
return environ;
#endif