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 0f30e4e03eb7f766c0a991185b49b3c814b7df2f..0b356638358089ef2c3cb085b41e028cda59ae86 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,13 +1,14 @@
 /* Generic string.h */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 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
@@ -42,37 +43,30 @@
 #      endif
 #endif
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLDAP_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
-#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 ));
+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 */
-       LDAP_F(char *) (strdup)();
+       /* Windows does not require this declaration */
+       LDAP_LIBC_F(char *) (strdup)();
 #endif
 
 /*
  * some systems fail to declare strcasecmp() and strncasecmp()
  * we need them declared so we can obtain pointers to them
  */
-LDAP_F(int) (strcasecmp)();
-LDAP_F(int) (strncasecmp)();
+
+/* we don't want these declared for Windows or Mingw */
+#ifndef _WIN32
+int (strcasecmp)();
+int (strncasecmp)();
+#endif
 
 #ifndef SAFEMEMCPY
 #      if defined( HAVE_MEMMOVE )
@@ -85,4 +79,10 @@ LDAP_F(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 */