Add reference to slappasswd(8)

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index a3d0fe4c880e71763362f1ae1c0a32d414791aad..bb1c10b836598cfa772eab64194b52da5c95c892 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,6 +1,7 @@
 /* Generic string.h */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -24,11 +25,6 @@
 
 #      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
@@ -46,27 +42,27 @@
 #      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
+/* use ldap_pvt_strtok instead of strtok or strtok_r! */
+LIBLDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, const char *delim,
+                                          char **pos ));
 
-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)
+#      define strdup(s) ber_strdup(s)
 #else
        /* some systems fail to declare strdup */
-       extern char *strdup();
+       LIBC_F(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();
+
+/* In Mingw32, strcasecmp is not in the C library, so we don't LIBC_F it */
+int (strcasecmp)();
+int (strncasecmp)();
 
 #ifndef SAFEMEMCPY
 #      if defined( HAVE_MEMMOVE )
@@ -79,5 +75,4 @@ extern int strcasecmp(), strncasecmp();
 #      endif
 #endif
 
-
 #endif /* _AC_STRING_H */