Mercurial > hg > octave-terminal
changeset 2610:8125b6f9c134
[project @ 1997-01-20 17:23:44 by jwe]
author | jwe |
---|---|
date | Mon, 20 Jan 1997 17:25:41 +0000 |
parents | 12bc9d0a50b5 |
children | 4474b4cf6cf6 |
files | ChangeLog Makeconf.in configure.in info/ChangeLog info/Makefile.in readline/ChangeLog readline/Makefile.in src/ChangeLog src/file-info.cc src/file-io.cc src/oct-fstrm.h src/oct-iostrm.h src/oct-stdstrm.cc src/oct-stdstrm.h src/oct-stream.cc src/oct-stream.h src/oct-strstrm.cc src/oct-strstrm.h src/sysdep.cc src/syswait.h |
diffstat | 20 files changed, 62 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Jan 20 11:16:21 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (RLD_FLAG): For sparc-sun-sunos4*, remove space + between -L and $(libdir). + +Sun Jan 19 15:57:20 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in, configure.in: Delete FUGLY. + Wed Jan 8 23:12:02 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (DEFAULT_PAGER): On cygwin32 systems, also look for
--- a/Makeconf.in +++ b/Makeconf.in @@ -54,9 +54,8 @@ F77 = @F77@ FFLAGS = @FFLAGS@ FPICFLAG = @FPICFLAG@ -FUGLY = @FUGLY@ FORTRAN_MAIN_FLAG = @FORTRAN_MAIN_FLAG@ -ALL_FFLAGS = $(FUGLY) $(FFLAGS) +ALL_FFLAGS = $(FFLAGS) # cc and associated flags.
--- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.244 $) +AC_REVISION($Revision: 1.245 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -413,7 +413,7 @@ ;; sparc-sun-sunos4*) FPICFLAG=-PIC - RLD_FLAG='-L $(libdir)' + RLD_FLAG='-L$(libdir)' ;; sparc-sun-solaris2*) FPICFLAG=-PIC @@ -534,13 +534,10 @@ AC_CHECK_PROGS(F77, g77 f77 f90 xlf cf77 fc) fi -FUGLY= have_fortran_compiler=false have_f2c=false if $use_g77; then - FUGLY=-fugly - AC_MSG_RESULT([defining FUGLY to be $FUGLY]) OCTAVE_FLIBS AC_DEFINE(F77_APPEND_UNDERSCORE, 1) AC_MSG_RESULT([defining F77_APPEND_UNDERSCORE to be 1]) @@ -665,7 +662,6 @@ AC_SUBST(FC) AC_SUBST(F77) AC_SUBST(FFLAGS) -AC_SUBST(FUGLY) AC_SUBST(FLIBS) AC_SUBST(F2C) AC_SUBST(F2CFLAGS) @@ -1139,7 +1135,7 @@ if test -z "$F77"; then FORT="$F2C $F2CFLAGS" else - FORT="$F77 $FFLAGS $FUGLY" + FORT="$F77 $FFLAGS" fi AC_MSG_RESULT([
--- a/info/ChangeLog +++ b/info/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 18 15:57:49 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (MAKEDOC_OBJECTS): Also include $(LIBOBJS). + Wed Jan 15 14:52:23 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (LIBOBJS): Allow substitution.
--- a/info/Makefile.in +++ b/info/Makefile.in @@ -1,5 +1,5 @@ # Makefile for texinfo/info. -*- Indented-Text -*- -# $Id: Makefile.in,v 1.36 1997-01-15 21:18:57 jwe Exp $ +# $Id: Makefile.in,v 1.37 1997-01-20 17:25:41 jwe Exp $ # # Copyright (C) 1993,96 Free Software Foundation, Inc. @@ -95,7 +95,7 @@ $(srcdir)/footnotes.c $(srcdir)/variables.c # The name of the program which builds documentation structure from CMDFILES. -MAKEDOC_OBJECTS = makedoc.o clib.o xmalloc.o +MAKEDOC_OBJECTS = makedoc.o clib.o xmalloc.o $(LIBOBJS) MAKEDOC_SOURCE = makedoc.c clib.c xmalloc.c infofiles = info.info info-stnd.info
--- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 18 15:56:49 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (stamp-readline): Put CC command on a single line. + Mon Dec 9 13:13:59 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * complete.c (username_completion_function) [__CYGWIN32__]:
--- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -148,8 +148,7 @@ stamp-readline: $(PICOBJ) if $(SHARED_LIBS); then \ - $(CC) -shared -o libreadline.$(SHLEXT) $(PICOBJ) \ - $(SH_TERMLIBS); \ + $(CC) -shared -o libreadline.$(SHLEXT) $(PICOBJ) $(SH_TERMLIBS); \ fi touch stamp-readline
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +Mon Jan 20 11:11:12 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * file-io.cc: Don't include "syswait.h" here. + +Sun Jan 19 22:38:45 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-stream.h (octave_base_stream::seek): Declare offset arg as + streamoff, not streampos. + (octave_stream::seek): Likewise. + * oct-strstrm.h (octave_base_strstream::seek): Likewise. + * oct-stdstrm.h (octave_base_stdiostream::seek): Likewise. + * oct-iostrm.h (octave_base_iostream::seek): Likewise. + * oct-fstrm.h (octave_fstream::seek): Likewise. + Fri Jan 17 18:13:10 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * file-io.cc (Ffflush): Handle stdout as a special case.
--- a/src/file-info.cc +++ b/src/file-info.cc @@ -20,13 +20,10 @@ */ -// Written by John C. Campbell <jcc@bevo.che.wisc.edu> -// -// Thomas Baier <baier@ci.tuwien.ac.at> added the following functions: -// -// popen pclose execute sync_system async_system -// waitpid mkfifo unlink +// Originally written by John C. Campbell <jcc@bevo.che.wisc.edu> +// Completely rewritten by John W. Eaton <jwe@bevo.che.wisc.edu>, +// April 1996. #ifdef HAVE_CONFIG_H #include <config.h>
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -63,7 +63,6 @@ #include "oct-strstrm.h" #include "pager.h" #include "sysdep.h" -#include "syswait.h" #include "utils.h" #include "variables.h"
--- a/src/oct-fstrm.h +++ b/src/oct-fstrm.h @@ -41,7 +41,7 @@ // Position a stream at OFFSET relative to ORIGIN. - int seek (streampos offset, ios::seek_dir origin); + int seek (streamoff offset, ios::seek_dir origin); // Return current stream position.
--- a/src/oct-iostrm.h +++ b/src/oct-iostrm.h @@ -43,7 +43,7 @@ // Position a stream at OFFSET relative to ORIGIN. - int seek (streampos offset, ios::seek_dir origin); + int seek (streamoff offset, ios::seek_dir origin); // Return current stream position.
--- a/src/oct-stdstrm.cc +++ b/src/oct-stdstrm.cc @@ -40,7 +40,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_base_stdiostream::seek (streampos offset, ios::seek_dir origin) +octave_base_stdiostream::seek (streamoff offset, ios::seek_dir origin) { int retval = -1;
--- a/src/oct-stdstrm.h +++ b/src/oct-stdstrm.h @@ -42,7 +42,7 @@ // Position a stream at OFFSET relative to ORIGIN. - int seek (streampos offset, ios::seek_dir origin); + int seek (streamoff offset, ios::seek_dir origin); // Return current stream position.
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -2050,7 +2050,7 @@ } int -octave_stream::seek (streampos offset, ios::seek_dir origin) +octave_stream::seek (streamoff offset, ios::seek_dir origin) { int retval = -1;
--- a/src/oct-stream.h +++ b/src/oct-stream.h @@ -228,7 +228,7 @@ // Position a stream at OFFSET relative to ORIGIN. - virtual int seek (streampos offset, ios::seek_dir origin) = 0; + virtual int seek (streamoff offset, ios::seek_dir origin) = 0; // Return current stream position. @@ -374,7 +374,7 @@ string gets (int max_len, bool& err); string gets (const octave_value& max_len, bool& err); - int seek (streampos offset, ios::seek_dir origin); + int seek (streamoff offset, ios::seek_dir origin); int seek (const octave_value& offset, const octave_value& origin); long tell (void) const;
--- a/src/oct-strstrm.cc +++ b/src/oct-strstrm.cc @@ -29,7 +29,7 @@ // Position a stream at OFFSET relative to ORIGIN. int -octave_base_strstream::seek (streampos offset, ios::seek_dir origin) +octave_base_strstream::seek (streamoff offset, ios::seek_dir origin) { int retval = -1;
--- a/src/oct-strstrm.h +++ b/src/oct-strstrm.h @@ -43,7 +43,7 @@ // Position a stream at OFFSET relative to ORIGIN. - int seek (streampos offset, ios::seek_dir origin); + int seek (streamoff offset, ios::seek_dir origin); // Return current stream position.
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -109,7 +109,7 @@ } #endif -#if defined NeXT +#if defined (NeXT) extern "C" { typedef void (*_cplus_fcn_int) (int); @@ -184,9 +184,9 @@ { #if defined (__386BSD__) || defined (__FreeBSD__) BSD_init (); -#elif defined NeXT +#elif defined (NeXT) NeXT_init (); -#elif defined __EMX__ +#elif defined (__EMX__) OS2_init (); #elif defined (SCO) SCO_init ();
--- a/src/syswait.h +++ b/src/syswait.h @@ -33,6 +33,15 @@ #include <sys/wait.h> #endif +// NeXT has sys/wait.h, but it is not compatible with POSIX.1, so we +// try to define waitpid in terms of wait4. + +#if defined (NeXT) +#include <sys/wait.h> +#define waitpid(a, b, c) \ + wait4 ((a) == -1 ? 0 : (a), (union wait *)(b), c, 0) +#endif + #ifndef WIFEXITED #define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif