diff options
| author | Tristan Gingold <gingold@adacore.com> | 2015-01-30 15:13:15 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-01-30 16:13:15 +0100 |
| commit | 1de83011b142444b5b35e699799c2e7b1485b8e6 (patch) | |
| tree | 15a4595e216594f9d2039c279dd378da7e971690 /gcc/ada | |
| parent | 2c6336bec3f0a2db44fa56e7448aaf119aa6665c (diff) | |
| download | gcc-1de83011b142444b5b35e699799c2e7b1485b8e6.zip gcc-1de83011b142444b5b35e699799c2e7b1485b8e6.tar.gz gcc-1de83011b142444b5b35e699799c2e7b1485b8e6.tar.bz2 | |
re PR ada/64349 (Bootstrapping Ada fails on darwin(9|10).)
2015-01-30 Tristan Gingold <gingold@adacore.com>
PR ada/64349
* env.c: Move vxworks and darwin includes out of #ifdef IN_RTS.
From-SVN: r220285
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/env.c | 33 |
2 files changed, 21 insertions, 17 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6a0dbd2..2f1b532 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-01-30 Tristan Gingold <gingold@adacore.com> + + PR ada/64349 + * env.c: Move vxworks and darwin includes out of #ifdef IN_RTS. + 2015-01-30 Gary Dismukes <dismukes@adacore.com> * freeze.adb: Minor reformatting. diff --git a/gcc/ada/env.c b/gcc/ada/env.c index f8608bc..ebcbb6d 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 2005-2014, Free Software Foundation, Inc. * + * Copyright (C) 2005-2015, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -30,15 +30,21 @@ ****************************************************************************/ #ifdef IN_RTS -#include "tconfig.h" -#include "tsystem.h" - -#include <sys/stat.h> -#include <fcntl.h> -#include <time.h> -#ifdef VMS -#include <unixio.h> -#endif +# include "tconfig.h" +# include "tsystem.h" + +# include <sys/stat.h> +# include <fcntl.h> +# include <time.h> +# ifdef VMS +# include <unixio.h> +# endif +/* We don't have libiberty, so use malloc. */ +# define xmalloc(S) malloc (S) +#else /* IN_RTS */ +# include "config.h" +# include "system.h" +#endif /* IN_RTS */ #if defined (__MINGW32__) #include <stdlib.h> @@ -71,13 +77,6 @@ #endif #endif -/* We don't have libiberty, so use malloc. */ -#define xmalloc(S) malloc (S) -#else /* IN_RTS */ -#include "config.h" -#include "system.h" -#endif /* IN_RTS */ - #ifdef __cplusplus extern "C" { #endif |