# HG changeset patch
# User jwe
# Date 793859336 0
# Node ID 22741d6ed8188c14fef6bcd8ad6ef20934bb3362
# Parent  cdfbe8141ef65a8ac4540bcebefe2fb14b3d38de
[project @ 1995-02-27 04:26:21 by jwe]

diff -r cdfbe8141ef6 -r 22741d6ed818 src/dynamic-ld.cc
--- a/src/dynamic-ld.cc	Mon Feb 27 04:18:19 1995 +0000
+++ b/src/dynamic-ld.cc	Mon Feb 27 04:28:56 1995 +0000
@@ -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"
diff -r cdfbe8141ef6 -r 22741d6ed818 src/help.cc
--- a/src/help.cc	Mon Feb 27 04:18:19 1995 +0000
+++ b/src/help.cc	Mon Feb 27 04:28:56 1995 +0000
@@ -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);
     }
 
diff -r cdfbe8141ef6 -r 22741d6ed818 src/pt-exp-base.cc
--- a/src/pt-exp-base.cc	Mon Feb 27 04:18:19 1995 +0000
+++ b/src/pt-exp-base.cc	Mon Feb 27 04:28:56 1995 +0000
@@ -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)
 	    {
diff -r cdfbe8141ef6 -r 22741d6ed818 src/utils.cc
--- a/src/utils.cc	Mon Feb 27 04:18:19 1995 +0000
+++ b/src/utils.cc	Mon Feb 27 04:28:56 1995 +0000
@@ -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"