This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch/5.3] expect on IRIX 6.5


Hello,

I've committed the attached (5.3 and mainline), it fixes the IRIX 6.5 build problem.

So, er, where is the official expect home? I'll, regardless, forward this to dejagnu.

Andrew
2002-11-19  Andrew Cagney  <ac131313@redhat.com>

	* exp_clib.c (ecases;): Cast value returned by TclRegComp to a
 	void pointer.
	* exp_command.c (Exp_SpawnCmd): Cast `wfd' to an int before
	passing to `dup'.  Pass `rfd' and `wfd' to an int before assigning
	to `master'.

Index: exp_clib.c
===================================================================
RCS file: /cvs/src/src/expect/exp_clib.c,v
retrieving revision 1.2
diff -u -r1.2 exp_clib.c
--- exp_clib.c	8 Sep 2001 06:26:30 -0000	1.2
+++ exp_clib.c	20 Nov 2002 00:18:31 -0000
@@ -773,7 +773,7 @@
 	for (ec=ecases;ec->type != exp_end;ec++) {
 		if ((ec->type == exp_regexp) && !ec->re) {
 			TclRegError((char *)0);
-			if (!(ec->re = TclRegComp(ec->pattern))) {
+			if (!(ec->re = (void*)TclRegComp(ec->pattern))) {
 				fprintf(stderr,"regular expression %s is bad: %s",ec->pattern,TclGetRegError());
 				return_errno(EINVAL);
 			  }
Index: exp_command.c
===================================================================
RCS file: /cvs/src/src/expect/exp_command.c,v
retrieving revision 1.4
diff -u -r1.4 exp_command.c
--- exp_command.c	7 Mar 2002 02:27:52 -0000	1.4
+++ exp_command.c	20 Nov 2002 00:18:31 -0000
@@ -917,7 +917,7 @@
 #endif /* TCL_MAJOR_VERSION < 8 */
 		}
 
-		master = ((mode & TCL_READABLE)?rfd:wfd);
+		master = (int)((mode & TCL_READABLE)?rfd:wfd);
 
 		/* make a new copy of file descriptor */
 		if (-1 == (write_master = master = dup(master))) {
@@ -927,7 +927,7 @@
 
 		/* if writefilePtr is different, dup that too */
 		if ((mode & TCL_READABLE) && (mode & TCL_WRITABLE) && (wfd != rfd)) {
-			if (-1 == (write_master = dup(wfd))) {
+			if (-1 == (write_master = dup((int)wfd))) {
 				exp_error(interp,"fdopen: %s",Tcl_PosixError(interp));
 				return TCL_ERROR;
 			}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]