Mercurial > hg > octave-avbm
changeset 1155:22741d6ed818
[project @ 1995-02-27 04:26:21 by jwe]
| author | jwe |
|---|---|
| date | Mon, 27 Feb 1995 04:28:56 +0000 |
| parents | cdfbe8141ef6 |
| children | f6b740a1fa09 |
| files | src/dynamic-ld.cc src/help.cc src/pt-exp-base.cc src/utils.cc |
| diffstat | 4 files changed, 5 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dynamic-ld.cc +++ b/src/dynamic-ld.cc @@ -32,16 +32,9 @@ #ifdef WITH_DLD #include <dld/dld.h> #endif - -#define boolean kpathsea_boolean -#define false kpathsea_false -#define true kpathsea_true -#include <kpathsea/pathsearch.h> -#undef true -#undef false -#undef boolean } +#include "pathsearch.h" #include "dynamic-ld.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/help.cc +++ b/src/help.cc @@ -68,13 +68,7 @@ #include <readline/tilde.h> } -extern "C" -{ -#define boolean kpathsea_boolean -#define false kpathsea_false -#define true kpathsea_true -#include <kpathsea/pathsearch.h> -} +#include "pathsearch.h" static help_list operators[] = { @@ -516,6 +510,7 @@ delete [] names; } } + path_elt = kpse_path_element (0); }
--- a/src/pt-exp-base.cc +++ b/src/pt-exp-base.cc @@ -2106,7 +2106,7 @@ int last_was_scalar_type = 0; for (Pix p = lhs->first (); p != 0; lhs->next (p)) { - tree_index_expression *lhs_expr = (*lhs) (p); + tree_index_expression *lhs_expr = lhs->operator () (p); if (i < nargout) {
--- a/src/utils.cc +++ b/src/utils.cc @@ -46,11 +46,6 @@ extern int strncasecmp (const char*, const char*, size_t); #endif -#define boolean kpathsea_boolean -#define false kpathsea_false -#define true kpathsea_true -#include <kpathsea/pathsearch.h> - #if defined (HAVE_TERMIOS_H) #include <termios.h> #elif defined (HAVE_TERMIO_H) @@ -85,6 +80,7 @@ #include "SLStack.h" +#include "pathsearch.h" #include "procstream.h" #include "user-prefs.h" #include "variables.h"