Maintaining C++ compiling (except for two issues that will

need another commit).

* filter.c: Include "gc.h" for prototype of protect.
(struct filter_pair): Use const wchar_t *, so we can assign
literals.
(html_hex_continue): Ditto.

* lib.c (and): Function renamed to andf, since and is a C++
operator.

* lib.h (and): Declaration renamed.

* match.c (match_files): Use of and updated to andf.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib.c b/lib.c
index d4918993..932fecde 100644
--- a/lib.c
+++ b/lib.c
@@ -1515,7 +1515,7 @@ static val do_and(val fun1_list, val arg)
   return t;
 }
 
-val and(val first_fun, ...)
+val andf(val first_fun, ...)
 {
   va_list vl;
   list_collect_decl (out, iter);