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 19efea1b780ea8397f0c987af664e0343f8e5929..0b356638358089ef2c3cb085b41e028cda59ae86 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,4 +1,15 @@
 /* Generic string.h */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * 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
 #define _AC_STRING_H
@@ -17,27 +28,44 @@
 #              include <memory.h>
 #      endif
 
-#      ifdef HAVE_MALLOC_H
-#              include <malloc.h>
-#      endif
-
-#      ifndef HAVE_STRCHR
+#      ifndef HAVE_STRRCHR
+#              undef strchr
 #              define strchr index
+#              undef strrchr
 #              define strrchr rindex
 #      endif
 
 #      ifndef HAVE_MEMCPY
-#              define memcpy(d, s, n)                  bcopy ((s), (d), (n))
-#              define memmove(d, s, n)                 bcopy ((s), (d), (n))
+#              undef memcpy
+#              define memcpy(d, s, n)          ((void) bcopy ((s), (d), (n)))
+#              undef memmove
+#              define memmove(d, s, n)         ((void) bcopy ((s), (d), (n)))
 #      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 ));
+
+#ifndef HAVE_STRDUP
+       /* strdup() is missing, declare our own version */
+#      undef strdup
+#      define strdup(s) ber_strdup(s)
+#elif !defined(_WIN32)
+       /* some systems fail to declare strdup */
+       /* Windows does not require this declaration */
+       LDAP_LIBC_F(char *) (strdup)();
+#endif
+
 /*
- * provide prototypes for missing functions that we replace.
- * replacements can be found in -llutil
+ * some systems fail to declare strcasecmp() and strncasecmp()
+ * we need them declared so we can obtain pointers to them
  */
-#ifndef HAVE_STRDUP
-       char *strdup( const char *s );
+
+/* we don't want these declared for Windows or Mingw */
+#ifndef _WIN32
+int (strcasecmp)();
+int (strncasecmp)();
 #endif
 
 #ifndef SAFEMEMCPY
@@ -51,4 +79,10 @@
 #      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 */