diff options
| author | Gabriel Dos Reis <gdr@integrable-solutions.net> | 2006-01-29 16:00:56 +0000 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2006-01-29 16:00:56 +0000 |
| commit | aa994333aab45b57c6d435d45cd0abe325d55b6e (patch) | |
| tree | 204a3a282cd168aaaa72bbe70d19eb6ecd07c85b /gcc | |
| parent | 98fb1d299e1edc713698419379a7423a446bc8e5 (diff) | |
| download | gcc-aa994333aab45b57c6d435d45cd0abe325d55b6e.zip gcc-aa994333aab45b57c6d435d45cd0abe325d55b6e.tar.gz gcc-aa994333aab45b57c6d435d45cd0abe325d55b6e.tar.bz2 | |
* toplev.c: Fix thinko.
From-SVN: r110374
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/toplev.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 366779f..de09758 100644 --- 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 --- 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 |