system.h: Prior to #define, #undef fopen and freopen unconditionally.

gcc/
        * system.h: Prior to #define, #undef fopen and freopen unconditionally.

libcpp/
        * system.h: Likewise.

From-SVN: r182837

gcc/ChangeLog

 2012-01-03  Olivier Hainque  <hainque@adacore.com>
 
+	* system.h: Prior to #define, #undef fopen and freopen unconditionally.
+
+2012-01-03  Olivier Hainque  <hainque@adacore.com>
+
 	* collect2.c (main): In AIX specific computations for vector
 	insertions, use CONST_CAST2 to cast from char ** to const char **.
 

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)

libcpp/ChangeLog

+2012-01-03  Olivier Hainque  <hainque@adacore.com>
+
+	* system.h: Prior to #define, #undef fopen and freopen unconditionally.
+
 2011-12-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* include/cpplib.h (CLK_GNUC1X): Change to CLK_GNUC11.

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)