aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2007-08-15 12:50:44 -0500
committerRob Landley <rob@landley.net>2007-08-15 12:50:44 -0500
commit9303e2fc38944c235c84483f6301cf4d09901b8f (patch)
tree01adda11173328f4390862f5d6cd01432e373bbc
parentf3c56e719e2e000aaf750230f18aea3b01af9ce7 (diff)
downloadtoybox-9303e2fc38944c235c84483f6301cf4d09901b8f.tar.gz
More klibc fixes from Maximilian Attems, strlcpy() this time.
-rw-r--r--lib/lib.c2
-rw-r--r--lib/lib.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/lib.c b/lib/lib.c
index aca70c40..64c85698 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -11,7 +11,7 @@
#include "toys.h"
-#ifndef __UCLIBC__
+#if !defined(__UCLIBC__) && !defined(__KLIBC__)
// uClibc has this, and if we define our own it conflicts.
diff --git a/lib/lib.h b/lib/lib.h
index baa52681..37a94a53 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -31,7 +31,7 @@ struct dirtree {
void get_optflags(void);
// functions.c
-#ifndef __UCLIBC__
+#if !defined(__UCLIBC__) && !defined(__KLIBC__)
void strlcpy(char *dest, char *src, size_t size);
#endif