Final round of module changes

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 2882db1240d4f0ff86ba99ee9f6dc4de6e521452..ca2eeb0b7d6bf3e01fa3b4e574ff954e84135307 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -24,43 +24,45 @@
 
 #      ifdef HAVE_MEMORY_H
 #              include <memory.h>
-#      endif
-
-       /* we should actually create <ac/stdlib.h> */
-#      ifdef HAVE_MALLOC_H
-#              include <malloc.h>
 #      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
-#      define strtok_r(s, d, p) ldap_pvt_strtok((s),(d),(p))
-#endif
+/* use ldap_pvt_strtok instead of strtok or strtok_r! */
+LDAP_F(char *) ldap_pvt_strtok LDAP_P((
+       char *str, const char *delim, char **pos ));
+
+LDAP_F(char *) ldap_pvt_strdup LDAP_P((
+       const char * s ));
 
-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 */
-       extern char *strdup();
+       extern char *(strdup)();
 #endif
 
 /*
  * some systems fail to declare strcasecmp() and strncasecmp()
  * we need them declared so we can obtain pointers to them
  */
-extern int strcasecmp(), strncasecmp();
+extern int (strcasecmp)();
+extern int (strncasecmp)();
 
 #ifndef SAFEMEMCPY
 #      if defined( HAVE_MEMMOVE )
@@ -73,5 +75,4 @@ extern int strcasecmp(), strncasecmp();
 #      endif
 #endif
 
-
 #endif /* _AC_STRING_H */