#undef symbols before #defining them. This provides a little protection

when symbol being replaced was defined as a macro.

diff --git a/include/ac/string.h b/include/ac/string.h
index 2882db1240d4f0ff86ba99ee9f6dc4de6e521452..a3d0fe4c880e71763362f1ae1c0a32d414791aad 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -32,24 +32,30 @@
 #      endif
 
 #      ifndef HAVE_STRRCHR
+#              undef strchr
 #              define strchr index
+#              undef strrchr
 #              define strrchr rindex
 #      endif
 
 #      ifndef HAVE_MEMCPY
+#              undef memcpy
 #              define memcpy(d, s, n)          ((void) bcopy ((s), (d), (n)))
+#              undef memmove
 #              define memmove(d, s, n)         ((void) bcopy ((s), (d), (n)))
 #      endif
 #endif
 
 extern char *ldap_pvt_strtok( char *str, const char *delim, char **pos );
 #ifndef HAVE_STRTOK_R
+#      undef strtok_r
 #      define strtok_r(s, d, p) ldap_pvt_strtok((s),(d),(p))
 #endif
 
 extern char *ldap_pvt_strdup( const char * s );
 #ifndef HAVE_STRDUP
        /* strdup() is missing, declare our own version */
+#      undef strdup
 #      define strdup(s) ldap_pvt_strdup(s)
 #else
        /* some systems fail to declare strdup */