diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2015-05-30 21:13:59 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2015-05-30 21:13:59 +0000 |
| commit | 329be64b06b51c21981dc9aba66da805dc4398bf (patch) | |
| tree | 939ed8411c661f6e8dcf7ab478a1cc1abfa98185 /gcc/ada/sysdep.c | |
| parent | c67e8801d95237cf126a5b8ad6c2f59fc92c455a (diff) | |
| download | gcc-329be64b06b51c21981dc9aba66da805dc4398bf.zip gcc-329be64b06b51c21981dc9aba66da805dc4398bf.tar.gz gcc-329be64b06b51c21981dc9aba66da805dc4398bf.tar.bz2 | |
adaint.c: Test for __linux__ instead of linux and __sun__ instead of sun.
* adaint.c: Test for __linux__ instead of linux and __sun__ instead
of sun. Add missing leading underscore to AIX. Remove #elif 0.
* adaint.h: Likewise.
* cio.c: Likewise.
* cstreams.c: Likewise.
* env.c: Likewise.
* gsocket.h: Likewise.
* init.c: Likewise. Test for __i386__ instead of i386.
* link.c: Likewise.
* s-oscons-tmplt.c: Likewise.
* sysdep.c: Likewise.
* terminals.c: Likewise. Use BSD symbol instead of FREEBSD.
* tracebak.c: Likewise. Test for __sparc__ instead of sparc.
From-SVN: r223890
Diffstat (limited to 'gcc/ada/sysdep.c')
| -rw-r--r-- | gcc/ada/sysdep.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index fd90ffe..e671ab0 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -49,7 +49,7 @@ #endif #ifdef __ANDROID__ -#undef linux +#undef __linux__ #endif #ifdef IN_RTS @@ -66,7 +66,7 @@ #include <time.h> #include <errno.h> -#if defined (sun) && defined (__SVR4) && !defined (__vxworks) +#if defined (__sun__) && !defined (__vxworks) /* The declaration is present in <time.h> but conditionalized on a couple of macros we don't define. */ extern struct tm *localtime_r(const time_t *, struct tm *); @@ -282,10 +282,10 @@ __gnat_ttyname (int filedes) } #endif -#if defined (linux) || defined (sun) \ +#if defined (__linux__) || defined (__sun__) \ || defined (WINNT) \ || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \ - || (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \ + || (defined (__svr4__) && defined (__i386__)) || defined (__Lynx__) \ || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__GLIBC__) || defined (__APPLE__) @@ -335,9 +335,9 @@ getc_immediate_common (FILE *stream, int *avail, int waiting ATTRIBUTE_UNUSED) { -#if defined (linux) || defined (sun) \ +#if defined (__linux__) || defined (__sun__) \ || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \ - || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ + || defined (_AIX) || (defined (__svr4__) && defined (__i386__)) \ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__GLIBC__) || defined (__APPLE__) char c; @@ -355,9 +355,9 @@ getc_immediate_common (FILE *stream, /* Set RAW mode, with no echo */ termios_rec.c_lflag = termios_rec.c_lflag & ~ICANON & ~ECHO; -#if defined(linux) || defined (sun) \ +#if defined (__linux__) || defined (__sun__) \ || defined (__MACHTEN__) || defined (__hpux__) \ - || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ + || defined (_AIX) || (defined (__svr4__) && defined (__i386__)) \ || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ || defined (__GLIBC__) || defined (__APPLE__) eof_ch = termios_rec.c_cc[VEOF]; @@ -756,7 +756,7 @@ __gnat_localtime_tzoff (const time_t *timer ATTRIBUTE_UNUSED, struct tm tp ATTRIBUTE_UNUSED; /* AIX, HPUX, Sun Solaris */ -#if defined (_AIX) || defined (__hpux__) || defined (sun) +#if defined (_AIX) || defined (__hpux__) || defined (__sun__) { (*Lock_Task) (); @@ -819,7 +819,7 @@ __gnat_localtime_tzoff (const time_t *timer ATTRIBUTE_UNUSED, /* Darwin, Free BSD, Linux, where component tm_gmtoff is present in struct tm */ -#elif defined (__APPLE__) || defined (__FreeBSD__) || defined (linux) \ +#elif defined (__APPLE__) || defined (__FreeBSD__) || defined (__linux__) \ || defined (__GLIBC__) { localtime_r (timer, &tp); |