New module 'unicase/ulc-casecoll'.

[pspp] / lib / str-two-way.h

diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index 3aa3a1b76f6c1fc33c4389fa45badd19a91b4e42..b0338a70a1a9e02d80a17d007fcfa4c6ff4dd02d 100644 (file)
--- a/lib/str-two-way.h
+++ b/lib/str-two-way.h
@@ -67,7 +67,9 @@
 # define LONG_NEEDLE_THRESHOLD SIZE_MAX
 #endif
 
-#define MAX(a, b) ((a < b) ? (b) : (a))
+#ifndef MAX
+# define MAX(a, b) ((a < b) ? (b) : (a))
+#endif
 
 #ifndef CANON_ELEMENT
 # define CANON_ELEMENT(c) c
@@ -422,5 +424,6 @@ two_way_long_needle (const unsigned char *haystack, size_t haystack_len,
 
 #undef AVAILABLE
 #undef CANON_ELEMENT
+#undef CMP_FUNC
 #undef MAX
 #undef RETURN_TYPE