projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix test file perms
[gnulib.git]
/
lib
/
str-two-way.h
diff --git
a/lib/str-two-way.h
b/lib/str-two-way.h
index
3aa3a1b
..
b0338a7
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 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
#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 AVAILABLE
#undef CANON_ELEMENT
+#undef CMP_FUNC
#undef MAX
#undef RETURN_TYPE
#undef MAX
#undef RETURN_TYPE