diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 71547b78daba3fa4ca937eb9a410d96f8ff65cd1..4630b0626ea80d90539c1b8bb9b79760ffcedf99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-26  Richard Henderson  <rth@redhat.com>
+
+	* gcc.dg/compat/compat-common.h (CINT, CDBL): Use multiplication
+	by 1i instead of token pasting.
+
 2004-12-26  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR tree-optimization/17578
diff --git a/gcc/testsuite/gcc.dg/compat/compat-common.h b/gcc/testsuite/gcc.dg/compat/compat-common.h
index c2664acbd19407a62e0301d77e81d3102cb7a398..635e7446d7600ed02c6c222c11689f72026e953b 100644
--- a/gcc/testsuite/gcc.dg/compat/compat-common.h
+++ b/gcc/testsuite/gcc.dg/compat/compat-common.h
@@ -25,8 +25,8 @@
 #endif
 
 #ifdef __GNUC__
-#define CINT(x, y) (x + __extension__ y##i)
-#define CDBL(x, y) (x + __extension__ y##i)
+#define CINT(x, y) (x + y * __extension__ 1i)
+#define CDBL(x, y) (x + y * __extension__ 1i)
 #else
 #ifdef __SUNPRO_C
 /* ??? Complex support without <complex.h>.  */