https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64349
yuta tomino <demoonlit at panathenaia dot halfmoon.jp> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |demoonlit at panathenaia dot
halfm
| |oon.jp
--- Comment #10 from yuta tomino <demoonlit at panathenaia dot halfmoon.jp> ---
Please move #ifdef in the correct order.
--- a/gcc/ada/env.c
+++ b/gcc/ada/env.c
@@ -44,12 +44,6 @@
#include <stdlib.h>
#endif
-#if defined (__APPLE__) && !defined (__arm__)
-/* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not
- available on iOS. */
-#include <crt_externs.h>
-#endif
-
#if defined (__vxworks)
#if defined (__RTP__)
/* On VxWorks 6 Real-Time process mode, environ is defined in unistd.h.
*/
@@ -78,6 +72,12 @@
#include "system.h"
#endif /* IN_RTS */
+#if defined (__APPLE__) && !defined (__arm__)
+/* On Darwin, _NSGetEnviron must be used for shared libraries; but it is not
+ available on iOS. */
+#include <crt_externs.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -215,11 +215,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
