Avoid /* inside comments.

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 19efea1b780ea8397f0c987af664e0343f8e5929..764dfc448474529eca9a60f10a2bb6c12423720e 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,4 +1,18 @@
 /* Generic string.h */
+/* $OpenLDAP$ */
+/* 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, 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
 #define _AC_STRING_H
@@ -9,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
 
@@ -17,27 +32,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 +83,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 */