diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-27 12:28:44 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-27 12:28:44 +0000 |
| commit | 21a87c1d7052ca28f301de560789c3cf333f3c58 (patch) | |
| tree | 4c0a0fe12318fd865a2d1e8b8dc93de0f4d3acf2 /gcc/ada/sysdep.c | |
| parent | 2ade6f499615f562768c0d08bac68e2fedb9413a (diff) | |
| download | gcc-21a87c1d7052ca28f301de560789c3cf333f3c58.tar.gz | |
2004-10-26 Olivier Hainque <hainque@act-europe.fr>
Nicolas Setton <setton@act-europe.fr>
* expect.c, adaint.c, link.c, sysdep.c (unix sections): Guard with
"__unix__" instead of "unix".
The latter is implicitly defined by gcc3.2 but not by gcc >= 3.4, so the
sections were just mistakenly ignored. The former is
implicitely defined by gcc2.8, gcc3.2 and gcc3.4.
Update #ifdef preprocessor macro to detect the symbol __hpux__ instead
of hpux. This prevents an unwanted definition of the symbol
convert_addresses in adaint.o.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89642 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sysdep.c')
| -rw-r--r-- | gcc/ada/sysdep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index fcca318c7f5..e18fb2276e1 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2003 Free Software Foundation, Inc. * + * Copyright (C) 1992-2004 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- * @@ -289,7 +289,7 @@ __gnat_ttyname (int filedes) #if defined (linux) || defined (sun) || defined (sgi) || defined (__EMX__) \ || (defined (__osf__) && ! defined (__alpha_vxworks)) || defined (WINNT) \ - || defined (__MACHTEN__) || defined (hpux) || defined (_AIX) \ + || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \ || (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \ || defined (__CYGWIN__) || defined (__FreeBSD__) @@ -346,7 +346,7 @@ getc_immediate_common (FILE *stream, { #if defined (linux) || defined (sun) || defined (sgi) || defined (__EMX__) \ || (defined (__osf__) && ! defined (__alpha_vxworks)) \ - || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (hpux) \ + || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ || defined (__Lynx__) || defined (__FreeBSD__) char c; @@ -365,7 +365,7 @@ getc_immediate_common (FILE *stream, termios_rec.c_lflag = termios_rec.c_lflag & ~ICANON & ~ECHO; #if defined(linux) || defined (sun) || defined (sgi) || defined (__EMX__) \ - || defined (__osf__) || defined (__MACHTEN__) || defined (hpux) \ + || defined (__osf__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ || defined (__Lynx__) || defined (__FreeBSD__) eof_ch = termios_rec.c_cc[VEOF]; |