* toplev.c: Fix thinko.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110374 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 366779f..de09758 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,8 @@
 2006-01-29  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * toplev.c: Fix thinko.
+
+2006-01-29  Gabriel Dos Reis  <gdr@integrable-solutions.net>
            Marcin Dalecki  <martin@dalecki.de>
 
        * toplev.c (floor_log2, exact_log2): Don't define if __cplusplus.

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 62c9b4f..f6cfe7c 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -520,7 +520,7 @@ read_integral_parameter (const char *p, const char *pname, const int  defval)
    for floor_log2 and exact_log2; see toplev.h.  That construct, however,
    conflicts with the ISO C++ One Definition Rule.   */
 
-#if !defined (__cplusplus)
+#if GCC_VERSION < 3004 || !defined (__cplusplus)
 
 /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X.
    If X is 0, return -1.  */
@@ -572,7 +572,7 @@ exact_log2 (unsigned HOST_WIDE_INT x)
 #endif
 }
 
-#endif /* !defined (__cplusplus)  */
+#endif /*  GCC_VERSION < 3004 || !defined (__cplusplus)  */
 
 /* Handler for fatal signals, such as SIGSEGV.  These are transformed
    into ICE messages, which is much more user friendly.  In case the