Solaris2.7 bootstrap failure, cc cannot compile cpplex.c

[Kaveh R. Ghazi]

 > From: Zack Weinberg <zack@wolery.cumb.org>
 > 
 > > Does either approach sound okay with you?
 > 
 > Let's take out the + 4.  Would you mind generating a patch to that
 > effect?  I have too many untested changes in my own tree right now,
 > and you can test the patch directly where I can't.  Consider it
 > pre-approved.
 > zw

Done.

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ChangeLog,v
retrieving revision 1.7065
diff -u -p -r1.7065 ChangeLog
--- ChangeLog	2000/07/11 13:39:07	1.7065
+++ ChangeLog	2000/07/11 14:26:49
@@ -1,3 +1,7 @@
+2000-07-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cpplex.c (T, I, S, C, N): Avoid non-constant initializers.
+
 2000-07-11  Neil Booth  <NeilB@earthling.net>
 
 	* cpp.texi: Update.
Index: cpplex.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cpplex.c,v
retrieving revision 1.67
diff -u -p -r1.67 cpplex.c
--- cpplex.c	2000/07/11 08:58:26	1.67
+++ cpplex.c	2000/07/11 14:26:54
@@ -162,11 +162,11 @@ token_spellings [N_TTYPES + 1] = {TTYPE_
 #undef N
 
 /* For debugging: the internal names of the tokens.  */
-#define T(e, s) U STRINGX(e) + 4,
-#define I(e, s) U STRINGX(e) + 4,
-#define S(e, s) U STRINGX(e) + 4,
-#define C(e, s) U STRINGX(e) + 4,
-#define N(e, s) U STRINGX(e) + 4,
+#define T(e, s) U STRINGX(e),
+#define I(e, s) U STRINGX(e),
+#define S(e, s) U STRINGX(e),
+#define C(e, s) U STRINGX(e),
+#define N(e, s) U STRINGX(e),
 
 const U_CHAR *const token_names[N_TTYPES] = { TTYPE_TABLE };