From 2e6611105be2fbf524eb7d1dbce2eb6ba5036260 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 17 Nov 2009 18:20:11 +0000
Subject: [PATCH] ITS#6351

---
 CHANGES             | 1 +
 include/ac/string.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b46130f740..740a28e286 100644
--- 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 09e2e31126..00c79d34a1 100644
--- 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)
 
-- 
2.39.5