# ifdef HAVE_MEMORY_H
# include <memory.h>
-# endif
-
- /* we should actually create <ac/stdlib.h> */
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
# endif
# ifndef HAVE_STRRCHR
# endif
#endif
-extern char *ldap_pvt_strtok( char *str, const char *delim, char **pos );
-#ifndef HAVE_STRTOK_R
-# undef strtok_r
-# define strtok_r(s, d, p) ldap_pvt_strtok((s),(d),(p))
-#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 ));
-extern char *ldap_pvt_strdup( const char * s );
#ifndef HAVE_STRDUP
/* strdup() is missing, declare our own version */
# undef strdup
# define strdup(s) ldap_pvt_strdup(s)
#else
/* some systems fail to declare strdup */
- extern char *strdup();
+ extern char *(strdup)();
#endif
/*
* some systems fail to declare strcasecmp() and strncasecmp()
* we need them declared so we can obtain pointers to them
*/
-extern int strcasecmp(), strncasecmp();
+extern int (strcasecmp)();
+extern int (strncasecmp)();
#ifndef SAFEMEMCPY
# if defined( HAVE_MEMMOVE )
# endif
#endif
-
#endif /* _AC_STRING_H */