diff options
| author | Dave Korn <dave.korn.cygwin@gmail.com> | 2009-07-26 15:09:10 +0000 |
|---|---|---|
| committer | Dave Korn <davek@gcc.gnu.org> | 2009-07-26 15:09:10 +0000 |
| commit | f6c7fcc0d57109c145195175cad0c7d433b1f39a (patch) | |
| tree | 031a5480960c46b8ab269e374fa54532a3f89cef /gcc/ada/adaint.h | |
| parent | c2600c676cfe1b90c6536476c3dbf887953fcc50 (diff) | |
| download | gcc-f6c7fcc0d57109c145195175cad0c7d433b1f39a.zip gcc-f6c7fcc0d57109c145195175cad0c7d433b1f39a.tar.gz gcc-f6c7fcc0d57109c145195175cad0c7d433b1f39a.tar.bz2 | |
re PR bootstrap/40578 (FOPEN double defined used in ada/adaint.h:58)
PR bootstrap/40578
* adaint.h (FOPEN, STAT, FSTAT, LSTAT, STRUCT_STAT): Rename from these
(GNAT_FOPEN, GNAT_STAT, GNAT_FSTAT, GNAT_LSTAT, GNAT_STRUCT_STAT): ...
to these.
(__gnat_stat): Adjust reference to STAT in prototype.
* adaint.c (__gnat_try_lock, __gnat_fopen, __gnat_file_length,
__gnat_named_file_length, __gnat_file_time_name, __gnat_file_time_fd,
__gnat_get_libraries_from_registry, __gnat_stat, __gnat_file_exists,
__gnat_is_regular_file, __gnat_is_directory, __gnat_is_readable_file,
__gnat_is_writable_file, __gnat_is_executable_file,
__gnat_set_writable, __gnat_set_executable, __gnat_set_non_writable,
__gnat_set_readable, __gnat_set_non_readable, __gnat_is_symbolic_link,
__gnat_copy_attribs): Adjust all references to the above.
* cstreams.c (__gnat_is_regular_file_fd): Likewise.
From-SVN: r150098
Diffstat (limited to 'gcc/ada/adaint.h')
| -rw-r--r-- | gcc/ada/adaint.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h index f5c283a..471b5ab 100644 --- a/gcc/ada/adaint.h +++ b/gcc/ada/adaint.h @@ -49,17 +49,17 @@ tested. */ #if defined (__GLIBC__) || defined (sun) || defined (__sgi) -#define FOPEN fopen64 -#define STAT stat64 -#define FSTAT fstat64 -#define LSTAT lstat64 -#define STRUCT_STAT struct stat64 +#define GNAT_FOPEN fopen64 +#define GNAT_STAT stat64 +#define GNAT_FSTAT fstat64 +#define GNAT_LSTAT lstat64 +#define GNAT_STRUCT_STAT struct stat64 #else -#define FOPEN fopen -#define STAT stat -#define FSTAT fstat -#define LSTAT lstat -#define STRUCT_STAT struct stat +#define GNAT_FOPEN fopen +#define GNAT_STAT stat +#define GNAT_FSTAT fstat +#define GNAT_LSTAT lstat +#define GNAT_STRUCT_STAT struct stat #endif /* Type corresponding to GNAT.OS_Lib.OS_Time */ @@ -94,7 +94,7 @@ extern int __gnat_open_new (char *, int); extern int __gnat_open_new_temp (char *, int); extern int __gnat_mkdir (char *); extern int __gnat_stat (char *, - STRUCT_STAT *); + GNAT_STRUCT_STAT *); extern int __gnat_unlink (char *); extern int __gnat_rename (char *, char *); extern int __gnat_chdir (char *); |