X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstr-two-way.h;h=b0338a70a1a9e02d80a17d007fcfa4c6ff4dd02d;hb=10bd9c6bbe33945829c0cacd60b66e44b3a4fb5b;hp=3aa3a1b76f6c1fc33c4389fa45badd19a91b4e42;hpb=c358da1eb79a1af4d7e4b887ca3896fb7f3fdcdb;p=gnulib.git

diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index 3aa3a1b76..b0338a70a 100644
--- 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