Added dnPretty2/dnNormalize2 using preallocated destination berval

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 8aad76eab9647d2435edacdb87c9cfba3c62fb07..0b356638358089ef2c3cb085b41e028cda59ae86 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -44,15 +44,16 @@
 #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_strtok LDAP_P(( char *str,
+       const char *delim, char **pos ));
 
 #ifndef HAVE_STRDUP
        /* strdup() is missing, declare our own version */
 #      undef strdup
 #      define strdup(s) ber_strdup(s)
-#else
+#elif !defined(_WIN32)
        /* some systems fail to declare strdup */
+       /* Windows does not require this declaration */
        LDAP_LIBC_F(char *) (strdup)();
 #endif
 
@@ -61,9 +62,11 @@ LDAP_F(char *) ldap_pvt_strtok LDAP_P(( char *str, const char *delim,
  * we need them declared so we can obtain pointers to them
  */
 
-/* In Mingw32, strcasecmp is not in the C library, so we don't LIBC_F it */
+/* we don't want these declared for Windows or Mingw */
+#ifndef _WIN32
 int (strcasecmp)();
 int (strncasecmp)();
+#endif
 
 #ifndef SAFEMEMCPY
 #      if defined( HAVE_MEMMOVE )