diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-01-26 10:42:04 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-01-26 10:42:04 +0100 |
| commit | ebd34478e30a770aa741cf345f08278090770ded (patch) | |
| tree | a7c7f6dd56455799bb7e32780d5f809be7a4beb6 /gcc/ada/env.c | |
| parent | d0709b6aeec6b00e71011502fa311751fc138147 (diff) | |
| download | gcc-ebd34478e30a770aa741cf345f08278090770ded.zip gcc-ebd34478e30a770aa741cf345f08278090770ded.tar.gz gcc-ebd34478e30a770aa741cf345f08278090770ded.tar.bz2 | |
[multiple changes]
2010-01-26 Robert Dewar <dewar@adacore.com>
* s-commun.ads, s-osprim-mingw.adb, s-stchop-vxworks.adb, sem_aggr.adb,
s-vxwext.adb, sem_ch10.adb, sem_eval.adb, sem_prag.adb: Minor
reformatting.
2010-01-26 Vasiliy Fofanov <fofanov@adacore.com>
* g-regist.adb, g-regist.ads (For_Every_Key): New generic procedure
that allows to iterate over all subkeys of a key.
2010-01-26 Ed Falis <falis@adacore.com>
* sysdep.c: enable NFS for VxWorks MILS
* env.c: enable __gnat_environ for VxWorks MILS
* gcc-interface/Makefile.in: Add VxWorks MILS target pairs.
From-SVN: r156233
Diffstat (limited to 'gcc/ada/env.c')
| -rw-r--r-- | gcc/ada/env.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ada/env.c b/gcc/ada/env.c index d948697..c8b49eb 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -52,7 +52,8 @@ #include <stdlib.h> #endif -#if defined (__vxworks) && ! (defined (__RTP__) || defined (__COREOS__)) +#if defined (__vxworks) \ + && ! (defined (__RTP__) || defined (__COREOS__) || defined (__VXWORKSMILS__)) #include "envLib.h" extern char** ppGlobalEnviron; #endif @@ -198,7 +199,8 @@ __gnat_setenv (char *name, char *value) char ** __gnat_environ (void) { -#if defined (VMS) || defined (RTX) || defined (VTHREADS) +#if defined (VMS) || defined (RTX) \ + || (defined (VTHREADS) && ! defined (__VXWORKSMILS__)) /* Not implemented */ return NULL; #elif defined (__APPLE__) @@ -210,9 +212,11 @@ __gnat_environ (void) extern char **_environ; return _environ; #else -#if ! (defined (__vxworks) && ! (defined (__RTP__) || defined (__COREOS__))) +#if ! (defined (__vxworks) \ + && ! (defined (__RTP__) || defined (__COREOS__) \ + || defined (__VXWORKSMILS__))) /* in VxWorks kernel mode environ is macro and not a variable */ - /* same thing on 653 in the CoreOS */ + /* same thing on 653 in the CoreOS and for VxWorks MILS vThreads */ extern char **environ; #endif return environ; |