summaryrefslogtreecommitdiff
path: root/source4/lib/replace
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-26 16:44:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:47 -0500
commita0d6264b9012372cd2e898003fb4b7db86ea016e (patch)
tree83efddd285e282bbb4a5834609b89afe11c1a928 /source4/lib/replace
parentd3c55f028e4160506538c9e1c57d3a6e22701a3c (diff)
downloadsamba-a0d6264b9012372cd2e898003fb4b7db86ea016e.tar.gz
samba-a0d6264b9012372cd2e898003fb4b7db86ea016e.tar.bz2
samba-a0d6264b9012372cd2e898003fb4b7db86ea016e.zip
r17841: Revert 17840, libldb.a defines strnlen. Sorry for the noise
(This used to be commit 1de34590821b0c076bf8d48cbdae97f33275647e)
Diffstat (limited to 'source4/lib/replace')
-rw-r--r--source4/lib/replace/config.m42
-rw-r--r--source4/lib/replace/replace.c14
2 files changed, 1 insertions, 15 deletions
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index adaba74568..93f0bb34a7 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -50,7 +50,7 @@ AC_CHECK_HEADERS(sys/syslog.h syslog.h)
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strnlen strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
AC_HAVE_DECL(setresuid, [#include <unistd.h>])
AC_HAVE_DECL(setresgid, [#include <unistd.h>])
AC_HAVE_DECL(errno, [#include <errno.h>])
diff --git a/source4/lib/replace/replace.c b/source4/lib/replace/replace.c
index 1cf91751b3..b8f4bc1c3c 100644
--- a/source4/lib/replace/replace.c
+++ b/source4/lib/replace/replace.c
@@ -387,20 +387,6 @@ duplicate a string
}
#endif
-#ifndef HAVE_STRNLEN
-/**
- Some platforms don't have strnlen
-**/
-
- size_t strnlen(const char *s, size_t n)
-{
- size_t i;
- for (i=0; i<n && s[i] != '\0'; i++)
- /* noop */ ;
- return i;
-}
-#endif
-
#ifndef HAVE_WAITPID
int waitpid(pid_t pid,int *status,int options)
{