summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ccan/str/debug.c3
-rw-r--r--lib/ccan/str/test/run.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/ccan/str/debug.c b/lib/ccan/str/debug.c
index 9ef756766a..027915bc64 100644
--- a/lib/ccan/str/debug.c
+++ b/lib/ccan/str/debug.c
@@ -86,6 +86,9 @@ int str_isxdigit(int i)
return isxdigit(i);
}
+#undef strstr
+#undef strchr
+#undef strrchr
char *str_strstr(const char *haystack, const char *needle)
{
diff --git a/lib/ccan/str/test/run.c b/lib/ccan/str/test/run.c
index a15654f8f3..f253746e7b 100644
--- a/lib/ccan/str/test/run.c
+++ b/lib/ccan/str/test/run.c
@@ -6,7 +6,8 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
-static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+static const char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar",
+ NULL };
#define NUM_SUBSTRINGS (ARRAY_SIZE(substrings) - 1)