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.h b/lib.h
index 1ffbc2e9..329504a5 100644
--- a/lib.h
+++ b/lib.h
@@ -356,7 +356,7 @@ val reduce_left(val fun, val list, val init, val key);
 val bind2(val fun2, val arg);
 val bind2other(val fun2, val arg2);
 val chain(val first_fun, ...);
-val and(val first_fun, ...);
+val andf(val first_fun, ...);
 val vector(val alloc);
 val vec_get_fill(val vec);
 val vec_set_fill(val vec, val fill);