diff options
| author | Olivier Hainque <hainque@act-europe.fr> | 2004-10-27 14:28:44 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-10-27 14:28:44 +0200 |
| commit | 7cd6e9f14f058fdac9ca87e19ff9c85907f3625c (patch) | |
| tree | 4c0a0fe12318fd865a2d1e8b8dc93de0f4d3acf2 /gcc/ada/expect.c | |
| parent | cc35610031fca77a8294a5c0e19dcb7fb8eb9888 (diff) | |
| download | gcc-7cd6e9f14f058fdac9ca87e19ff9c85907f3625c.zip gcc-7cd6e9f14f058fdac9ca87e19ff9c85907f3625c.tar.gz gcc-7cd6e9f14f058fdac9ca87e19ff9c85907f3625c.tar.bz2 | |
expect.c, [...] (unix sections): Guard with "__unix__" instead of "unix".
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.
From-SVN: r89642
Diffstat (limited to 'gcc/ada/expect.c')
| -rw-r--r-- | gcc/ada/expect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c index 5495226..9c76ba5 100644 --- a/gcc/ada/expect.c +++ b/gcc/ada/expect.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 2001-2003 Ada Core Technologies, Inc. * + * Copyright (C) 2001-2004 Ada Core Technologies, 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- * @@ -49,8 +49,8 @@ Dummy stubs are also provided for other systems. */ #ifdef _AIX -/* Work around the fact that gcc/cpp does not define "unix" under AiX. */ -#define unix +/* Work around the fact that gcc/cpp does not define "__unix__" under AiX. */ +#define __unix__ #endif #ifdef _WIN32 @@ -265,9 +265,9 @@ __gnat_expect_poll (int *fd, int num_fd, int timeout, int *is_set) return ready; } -#elif defined (unix) +#elif defined (__unix__) -#ifdef hpux +#ifdef __hpux__ #include <sys/ptyio.h> #endif @@ -359,7 +359,7 @@ __gnat_expect_poll (int *fd, int num_fd, int timeout, int *is_set) is_set[i] = 0; } -#ifdef hpux +#ifdef __hpux__ for (i = 0; i < num_fd; i++) { if (FD_ISSET (fd[i], &eset)) |