ITS#6351

diff --git a/CHANGES b/CHANGES
index b46130f740bdd337b873bcd04fcbada7b12b46dc..740a28e28605ed05fc17feba11faf41bedb5edd3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ OpenLDAP 2.4.20 Engineering
        Fixed slapo-syncprov deadlock (ITS#6335)
        Fixed slapo-syncprov out of order changes (ITS#6346)
        Build Environment
+               Fixed memrchr define (ITS#6351)
                Fixed slapd MAXPATHLEN handling (ITS#6342)
                Fixed test057 handling of memberof/refint (ITS#6343)
                Fixed slapd test error ignoring (ITS#6345)

diff --git a/include/ac/string.h b/include/ac/string.h
index 09e2e3112660781d8e345e194eba90945ff8b38a..00c79d34a11e8c7302b1756d0f42869043737fa7 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -98,8 +98,8 @@ int (strncasecmp)();
 #ifndef HAVE_MEMRCHR
 #undef memrchr
 #define memrchr lutil_memrchr
-#endif /* ! HAVE_MEMRCHR */
 void * memrchr(const void *b, int c, size_t len);
+#endif /* ! HAVE_MEMRCHR */
 
 #define STRLENOF(s)    (sizeof(s)-1)