diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/adaint.c | 4 | ||||
| -rw-r--r-- | gcc/ada/expect.c | 12 | ||||
| -rw-r--r-- | gcc/ada/link.c | 2 | ||||
| -rw-r--r-- | gcc/ada/sysdep.c | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 69b25e2..c1b85a0 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -1512,7 +1512,7 @@ __gnat_is_symbolic_link (char *name ATTRIBUTE_UNUSED) #if defined (__vxworks) return 0; -#elif defined (_AIX) || defined (unix) +#elif defined (_AIX) || defined (__unix__) int ret; struct stat statbuf; @@ -2441,7 +2441,7 @@ _flush_cache() || (! (defined (sparc) && defined (sun) && defined (__SVR4)) \ && ! (defined (linux) && defined (i386)) \ && ! defined (__FreeBSD__) \ - && ! defined (hpux) \ + && ! defined (__hpux__) \ && ! defined (_AIX) \ && ! (defined (__alpha__) && defined (__osf__)) \ && ! defined (__MINGW32__) \ 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)) diff --git a/gcc/ada/link.c b/gcc/ada/link.c index 70b349f..cc415ad 100644 --- a/gcc/ada/link.c +++ b/gcc/ada/link.c @@ -117,7 +117,7 @@ char __gnat_shared_libgnat_default = STATIC; unsigned char __gnat_using_gnu_linker = 1; const char *__gnat_object_library_extension = ".a"; -#elif defined (hpux) +#elif defined (__hpux__) const char *__gnat_object_file_option = "-Wl,-c,"; const char *__gnat_run_path_option = "-Wl,+b,"; int __gnat_link_max = 5000; diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index fcca318..e18fb22 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]; |