expect won't build with Tru64 cc

[Alexandre Oliva <aoliva@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 523 bytes --]

Using the following C compiler on alphaev6-dec-osf4.0f

% cc -V | head -1
DEC C V5.9-010 on Digital UNIX V4.0 (Rev. 1229)

GDB won't build (both CVS and mainline).  One of the reasons is that
expect contains an ill-formed C construct that the DEC C compiler
rejects (actually, it warns about it, but the #define fails to take
effect).  This patch fixes the problem.  I don't know whether this is
already fixed in expect upstream, so I'm Cc:ing Don Libes.

GDB/expect maintainers, ok to install in mainline and 5.2 branch?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: expect-alpha-cc.patch --]
[-- Type: text/x-patch, Size: 929 bytes --]

Index: expect/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* exp_command.c (STARARGV): Indent #defines properly.

Index: expect/exp_command.c
===================================================================
RCS file: /cvs/src/src/expect/exp_command.c,v
retrieving revision 1.3
diff -u -p -r1.3 exp_command.c
--- expect/exp_command.c 2001/09/11 19:24:03 1.3
+++ expect/exp_command.c 2002/03/06 23:52:38
@@ -2648,13 +2648,13 @@ Tcl_Obj *CONST argv[];	/* Argument objec
 	argc--; argv++;
 
 #if TCL_MAJOR_VERSION < 8
-  #define STARARGV *argv
+#  define STARARGV *argv
 #else
-  #if TCL_MINOR_VERSION < 3
-    #define STARARGV Tcl_GetStringFromObj(*argv,(int *)0)
-  #else
-    #define STARARGV Tcl_GetString(*argv)
-  #endif
+#  if TCL_MINOR_VERSION < 3
+#    define STARARGV Tcl_GetStringFromObj(*argv,(int *)0)
+#  else
+#    define STARARGV Tcl_GetString(*argv)
+#  endif
 #endif 
 
 	for (;argc>0;argc--,argv++) {

[-- Attachment #3: Type: text/plain, Size: 289 bytes --]


-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer