Mercurial > hg > octave-lyh
changeset 3072:ca9677cdb62e
[project @ 1997-07-15 02:45:42 by jwe]
| author | jwe |
|---|---|
| date | Tue, 15 Jul 1997 02:45:53 +0000 |
| parents | 00ef82060ebc |
| children | 132c83a7b706 |
| files | liboctave/Makefile.in liboctave/glob-match.cc src/ChangeLog src/Makefile.in src/dynamic-ld.cc src/utils.cc src/utils.h |
| diffstat | 7 files changed, 36 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -47,8 +47,9 @@ data-conv.h dir-ops.h file-ops.h file-stat.h getopt.h \ glob-match.h idx-vector.h lo-ieee.h lo-mappers.h lo-sysdep.h \ lo-utils.h mach-info.h oct-alloc.h oct-cmplx.h oct-env.h \ - oct-math.h oct-group.h oct-passwd.h oct-syscalls.h pathsearch.h \ - prog-args.h statdefs.h str-vec.h sun-utils.h sysdir.h syswait.h \ + oct-math.h oct-group.h oct-passwd.h oct-syscalls.h pathlen.h \ + pathsearch.h prog-args.h statdefs.h str-vec.h sun-utils.h \ + sysdir.h syswait.h \ $(MATRIX_INC) \ $(MX_OP_INC)
--- a/liboctave/glob-match.cc +++ b/liboctave/glob-match.cc @@ -104,7 +104,7 @@ { int n = glob_info.gl_pathc; - char **matches = glob_info.gl_pathv; + const char * const *matches = glob_info.gl_pathv; // XXX FIXME XXX -- we shouldn't have to check to see if // a single match exists, but it seems that glob() won't
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +Mon Jul 14 12:54:23 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * dynamic-ld.cc (octave_dynamic_loader::load_fcn_from_dot_oct_file): + If first attempt to load function fails, prepend and underscore + and try again. + + * Makefile.in (install-inc): If defaults.h, oct-conf.h, or + oct-gperf.h don't exist in the current directory, look in $(srcdir). + Mon Jul 7 21:14:07 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * DLD-FUNCTIONS/qr.cc (Fqr): Correctly handle nargout == 0.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -316,7 +316,11 @@ done for f in defaults.h oct-conf.h oct-gperf.h; do \ rm -f $(octincludedir)/$$f; \ - $(INSTALL_DATA) $$f $(octincludedir)/$$f; \ + if [ -f $$f ]; then \ + $(INSTALL_DATA) $$f $(octincludedir)/$$f ; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/$$f ; \ + fi ; \ done $(mk-includedir-link) .PHONY: install-inc
--- a/src/dynamic-ld.cc +++ b/src/dynamic-ld.cc @@ -233,6 +233,19 @@ builtin_fcn_installer f = instance->resolve_reference (mangled_name, oct_file); + + // XXX FIXME XXX -- this should probably be handled correctly by + // mangle_octave_oct_file_name using a configure test. + + if (! f) + { + string t = "_"; + + mangled_name = t.append (mangled_name); + + f = instance->resolve_reference (mangled_name, oct_file); + } + if (f) retval = f (); }
--- a/src/utils.cc +++ b/src/utils.cc @@ -110,7 +110,7 @@ // Ugh. int -keyword_almost_match (const char **std, int *min_len, const string& s, +keyword_almost_match (const char * const *std, int *min_len, const string& s, int min_toks_to_match, int max_toks) { int status = 0; @@ -138,9 +138,9 @@ return status; - char **to_match = new char * [max_toks + 1]; - const char **s1 = std; - char **s2 = to_match; + const char **to_match = new const char * [max_toks + 1]; + const char * const *s1 = std; + const char **s2 = to_match; if (! s1 || ! s2) goto done;