merge with 1.11.5

diff --git a/lib/regex.c b/lib/regex.c
index abe92ac8b7d5cc9e4db99869a05de24d5e7c4f89..f7e0917b0548c7135191ef49f7eb50b10901eca2 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -2756,7 +2756,7 @@ at_endline_loc_p (p, pend, syntax)
 {
   const char *next = p;
   boolean next_backslash = *next == '\\';
-  const char *next_next = p + 1 < pend ? p + 1 : NULL;
+  const char *next_next = p + 1 < pend ? p + 1 : 0;
   
   return
        /* Before a subexpression?  */