Sync with HEAD

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 4fe3b4a9b654f1e3355aad0d97caeab4d4fdac7f..764dfc448474529eca9a60f10a2bb6c12423720e 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,13 +1,17 @@
 /* Generic string.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_STRING_H
@@ -19,7 +23,8 @@
 #else
 #      ifdef HAVE_STRING_H
 #              include <string.h>
-#      elif HAVE_STRINGS_H
+#      endif
+#      if defined(HAVE_STRINGS_H) && (!defined(HAVE_STRING_H) || defined(BOTH_STRINGS_H))
 #              include <strings.h>
 #      endif
 
@@ -43,18 +48,17 @@
 #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 ));
-
-LIBLDAP_F(char *) ldap_pvt_strdup LDAP_P(( const char * s ));
+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) ldap_pvt_strdup(s)
-#else
+#      define strdup(s) ber_strdup(s)
+#elif !defined(_WIN32)
        /* some systems fail to declare strdup */
-       LIBC_F(char *) (strdup)();
+       /* Windows does not require this declaration */
+       LDAP_LIBC_F(char *) (strdup)();
 #endif
 
 /*
@@ -62,9 +66,11 @@ LIBLDAP_F(char *) ldap_pvt_strdup LDAP_P(( const char * s ));
  * 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 )
@@ -77,4 +83,10 @@ int (strncasecmp)();
 #      endif
 #endif
 
+#define AC_MEMCPY( d, s, n ) (SAFEMEMCPY((d),(s),(n)))
+#define AC_FMEMCPY( d, s, n ) do { \
+               if((n) == 1) *((char*)(d)) = *((char*)(s)); \
+               else AC_MEMCPY( (d), (s), (n) ); \
+       } while(0)
+
 #endif /* _AC_STRING_H */