Mercurial > hg > octave-lojdl
changeset 223:82c050e70f7a
[project @ 1993-11-14 10:58:11 by jwe]
author | jwe |
---|---|
date | Sun, 14 Nov 1993 11:01:14 +0000 |
parents | a592507b3bad |
children | 8379f38f80c3 |
files | liboctave/Makefile.in liboctave/lo-error.h src/octave.cc |
diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -30,13 +30,14 @@ INCLUDES = Bounds.h CollocWt.h DAE.h DAEFunc.h FEGrid.h FSQP.h \ LinConst.h LP.h LPsolve.h Matrix.h NLConst.h NLEqn.h \ NLFunc.h NLP.h NPSOL.h ODE.h ODEFunc.h Objective.h QLD.h \ - QP.h QPSOL.h Quad.h Range.h f77-uscore.h sun-utils.h + QP.h QPSOL.h Quad.h Range.h f77-uscore.h sun-utils.h \ + liboctave-error.h SOURCES = Bounds.cc ColVector.cc CollocWt.cc DAE.cc DAEFunc.cc \ DiagMatrix.cc FEGrid.cc FSQP.cc LinConst.cc LP.cc LPsolve.cc \ Matrix-ext.cc Matrix.cc NLConst.cc NLEqn.cc NLFunc.cc NPSOL.cc \ Objective.cc ODE.cc ODEFunc.cc QLD.cc QP.cc QPSOL.cc Quad.cc \ - Range.cc RowVector.cc sun-utils.cc + Range.cc RowVector.cc sun-utils.cc liboctave-error.cc EXTRAS = mx-inlines.cc
--- a/liboctave/lo-error.h +++ b/liboctave/lo-error.h @@ -41,9 +41,6 @@ extern void liboctave_fatal (const char *fmt, ...); -// Current error state. -extern int error_state; - #endif /*
--- a/src/octave.cc +++ b/src/octave.cc @@ -44,6 +44,8 @@ #include "getopt.h" +#include "liboctave-error.h" + #include "sighandlers.h" #include "variables.h" #include "error.h" @@ -383,6 +385,9 @@ // This is not really the right place to do this... set_Complex_error_handler (octave_Complex_error_handler); +// Or this, probably... + set_liboctave_error_handler (error); + // Do this first, since some command line arguments may override the // defaults. initialize_globals (argv[0]);