Merge latest devel codes into releng 2 branch.

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 980511d3d0d5b63ac15190d0ac090ae7ae5f360c..bb1c10b836598cfa772eab64194b52da5c95c892 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,7 +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
@@ -43,27 +43,26 @@
 #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 ));
+LIBLDAP_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) 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)();
-extern int (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 )