From 131e69c711fbeceb3813a4c1889a436b20d60045 Mon Sep 17 00:00:00 2001 From: hainque Date: Tue, 3 Jan 2012 11:44:34 +0000 Subject: [PATCH] gcc/ * system.h: Prior to #define, #undef fopen and freopen unconditionally. libcpp/ * system.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182837 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/system.h | 11 ++++++++--- libcpp/ChangeLog | 4 ++++ libcpp/system.h | 8 ++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c95a7ef..dd3c6d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2012-01-03 Olivier Hainque + * system.h: Prior to #define, #undef fopen and freopen unconditionally. + +2012-01-03 Olivier Hainque + * collect2.c (main): In AIX specific computations for vector insertions, use CONST_CAST2 to cast from char ** to const char **. diff --git a/gcc/system.h b/gcc/system.h index 0a943a3..51520e1 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -47,9 +47,14 @@ along with GCC; see the file COPYING3. If not see #endif /* Use the unlocked open routines from libiberty. */ -#ifdef fopen /* fopen is a #define on VMS. */ -#undef fopen -#endif + +/* Some of these are #define on some systems, e.g. on AIX to redirect + the names to 64bit capable functions for LARGE_FILES support. These + redefs are pointless here so we can override them. */ + +#undef fopen +#undef freopen + #define fopen(PATH,MODE) fopen_unlocked(PATH,MODE) #define fdopen(FILDES,MODE) fdopen_unlocked(FILDES,MODE) #define freopen(PATH,MODE,STREAM) freopen_unlocked(PATH,MODE,STREAM) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 261b8a5..dfe18d0 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2012-01-03 Olivier Hainque + + * system.h: Prior to #define, #undef fopen and freopen unconditionally. + 2011-12-20 Joseph Myers * include/cpplib.h (CLK_GNUC1X): Change to CLK_GNUC11. diff --git a/libcpp/system.h b/libcpp/system.h index 0f15e12..2a1f709 100644 --- a/libcpp/system.h +++ b/libcpp/system.h @@ -44,6 +44,14 @@ along with GCC; see the file COPYING3. If not see #endif /* Use the unlocked open routines from libiberty. */ + +/* Some of these are #define on some systems, e.g. on AIX to redirect + the names to 64bit capable functions for LARGE_FILES support. These + redefs are pointless here so we can override them. */ + +#undef fopen +#undef freopen + #define fopen(PATH,MODE) fopen_unlocked(PATH,MODE) #define fdopen(FILDES,MODE) fdopen_unlocked(FILDES,MODE) #define freopen(PATH,MODE,STREAM) freopen_unlocked(PATH,MODE,STREAM) -- 2.7.4