diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/env.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2668fcc4066..c5472727992 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -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. diff --git a/gcc/ada/env.c b/gcc/ada/env.c index ebcbb6db558..1a2afd64b9d 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -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 |