Mercurial > hg > octave-terminal
changeset 646:209eafc06817
[project @ 1994-08-24 06:41:56 by jwe]
author | jwe |
---|---|
date | Wed, 24 Aug 1994 06:41:56 +0000 |
parents | 21cb3c7dc9e3 |
children | d5ae051388b0 |
files | src/fsqp.cc src/npsol.cc src/qpsol.cc |
diffstat | 3 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fsqp.cc +++ b/src/fsqp.cc @@ -32,6 +32,8 @@ #include "help.h" #include "defun-dld.h" +#ifndef FSQP_MISSING + // Global pointers for user defined functions required by fsqp. // static tree *fsqp_objective; // static tree *fsqp_constraints; @@ -49,6 +51,8 @@ return retval; } +#endif + #if defined (FSQP_MISSING) DEFUN_DLD ("fsqp", Ffsqp, Sfsqp, 11, 3, "This function requires FSQP, which is not freely\n\
--- a/src/npsol.cc +++ b/src/npsol.cc @@ -38,6 +38,8 @@ #include "help.h" #include "defun-dld.h" +#ifndef NPSOL_MISSING + // Global pointers for user defined functions required by npsol. static tree_fvc *npsol_objective; static tree_fvc *npsol_constraints; @@ -227,6 +229,8 @@ return ok; } +#endif + #if defined (NPSOL_MISSING) DEFUN_DLD ("npsol", Fnpsol, Snpsol, 11, 3, "This function requires NPSOL, which is not freely\n\ @@ -525,6 +529,8 @@ return retval; } +#ifndef NPSOL_MISSING + typedef void (NPSOL_options::*d_set_opt_mf) (double); typedef void (NPSOL_options::*i_set_opt_mf) (int); typedef double (NPSOL_options::*d_get_opt_mf) (void); @@ -737,6 +743,8 @@ warning ("npsol_options: no match for `%s'", keyword); } +#endif + #if defined (NPSOL_MISSING) DEFUN_DLD ("npsol_options", Fnpsol_options, Snpsol_options, -1, 1, "This function requires NPSOL, which is not freely\n\
--- a/src/qpsol.cc +++ b/src/qpsol.cc @@ -38,6 +38,8 @@ #include "help.h" #include "defun-dld.h" +#ifndef QPSOL_MISSING + // This should probably be defined in some shared file and declared in // a header file... extern int linear_constraints_ok (const ColumnVector& x, @@ -47,6 +49,8 @@ static QPSOL_options qpsol_opts; +#endif + #if defined (QPSOL_MISSING) DEFUN_DLD ("qpsol", Fqpsol, Sqpsol, 9, 3, "This function requires QPSOL, which is not freely\n\ @@ -227,6 +231,8 @@ return retval; } +#ifndef QPSOL_MISSING + typedef void (QPSOL_options::*d_set_opt_mf) (double); typedef void (QPSOL_options::*i_set_opt_mf) (int); typedef double (QPSOL_options::*d_get_opt_mf) (void); @@ -343,6 +349,8 @@ warning ("qpsol_options: no match for `%s'", keyword); } +#endif + #if defined (QPSOL_MISSING) DEFUN_DLD ("qpsol_options", Fqpsol_options, Sqpsol_options, -1, 1, "This function requires QPSOL, which is not freely\n\