* [Ada] Fix bootstrapping on darwin9/10 (PR64349)
@ 2015-02-05 9:10 Arnaud Charlet
0 siblings, 0 replies; only message in thread
From: Arnaud Charlet @ 2015-02-05 9:10 UTC (permalink / raw)
To: gcc-patches; +Cc: Tristan Gingold
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
Move Darwin case before default one. Hopefully should be the last iteration
on this PR, sorry about the confusion!
Committed on trunk.
2015-02-05 Tristan Gingold <gingold@adacore.com>
PR ada/64349
* env.c: Fix thinko: handle Darwin case before default one.
[-- Attachment #2: difs --]
[-- Type: text/plain, Size: 490 bytes --]
Index: env.c
===================================================================
--- env.c (revision 220285)
+++ env.c (working copy)
@@ -214,11 +214,11 @@
#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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-05 9:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-05 9:10 [Ada] Fix bootstrapping on darwin9/10 (PR64349) Arnaud Charlet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).