# HG changeset patch # User jwe # Date 1041551422 0 # Node ID 1264aac9e73a03cd96a50debd4ad8b498eef392d # Parent bdaa0d3dfc0bf781e3e4498f559adc83fd0423dc [project @ 2003-01-02 23:50:22 by jwe] diff -r bdaa0d3dfc0b -r 1264aac9e73a src/ChangeLog --- a/src/ChangeLog Thu Jan 02 22:55:23 2003 +0000 +++ b/src/ChangeLog Thu Jan 02 23:50:22 2003 +0000 @@ -1,5 +1,7 @@ 2003-01-02 John W. Eaton + * Makefile.in (INCLUDES): Don't forget base-list.h. + * symtab.cc (symbol_record::define): If definition already exists, redefine it instead of replacing it. diff -r bdaa0d3dfc0b -r 1264aac9e73a src/Makefile.in --- a/src/Makefile.in Thu Jan 02 22:55:23 2003 +0000 +++ b/src/Makefile.in Thu Jan 02 23:50:22 2003 +0000 @@ -79,11 +79,11 @@ pt-jump.h pt-loop.h pt-mat.h pt-misc.h pt-plot.h \ pt-pr-code.h pt-select.h pt-stmt.h pt-unop.h pt-walk.h \ -INCLUDES := Cell.h c-file-ptr-stream.h comment-list.h defun-dld.h \ - defun-int.h defun.h dirfns.h dynamic-ld.h error.h file-io.h \ - fn-cache.h gripes.h help.h input.h lex.h load-save.h \ - oct-fstrm.h oct-hist.h oct-iostrm.h oct-map.h oct-obj.h \ - oct-prcstrm.h oct-procbuf.h oct-stdstrm.h \ +INCLUDES := Cell.h base-list.h c-file-ptr-stream.h comment-list.h \ + defun-dld.h defun-int.h defun.h dirfns.h dynamic-ld.h \ + error.h file-io.h fn-cache.h gripes.h help.h input.h \ + lex.h load-save.h oct-fstrm.h oct-hist.h oct-iostrm.h \ + oct-map.h oct-obj.h oct-prcstrm.h oct-procbuf.h oct-stdstrm.h \ oct-stream.h oct-strstrm.h oct-lvalue.h oct.h octave.h \ ops.h pager.h parse.h pr-output.h procstream.h sighandlers.h \ siglist.h symtab.h sysdep.h token.h toplev.h unwind-prot.h utils.h \ diff -r bdaa0d3dfc0b -r 1264aac9e73a src/version.h --- a/src/version.h Thu Jan 02 22:55:23 2003 +0000 +++ b/src/version.h Thu Jan 02 23:50:22 2003 +0000 @@ -23,7 +23,7 @@ #if !defined (octave_version_h) #define octave_version_h 1 -#define OCTAVE_VERSION "2.1.41" +#define OCTAVE_VERSION "2.1.42" #define OCTAVE_COPYRIGHT \ "Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 John W. Eaton."