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 bb1c10b836598cfa772eab64194b52da5c95c892..0b356638358089ef2c3cb085b41e028cda59ae86 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,13 +1,14 @@
 /* Generic string.h */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 
 #ifndef _AC_STRING_H
@@ -43,16 +44,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 ));
+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 */
-       LIBC_F(char *) (strdup)();
+       /* Windows does not require this declaration */
+       LDAP_LIBC_F(char *) (strdup)();
 #endif
 
 /*
@@ -60,9 +62,11 @@ LIBLDAP_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 )
@@ -75,4 +79,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 */