projects
/
platform
/
upstream
/
toybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f3c56e7
)
More klibc fixes from Maximilian Attems, strlcpy() this time.
author
Rob Landley
<rob@landley.net>
Wed, 15 Aug 2007 17:50:44 +0000
(12:50 -0500)
committer
Rob Landley
<rob@landley.net>
Wed, 15 Aug 2007 17:50:44 +0000
(12:50 -0500)
lib/lib.c
patch
|
blob
|
history
lib/lib.h
patch
|
blob
|
history
diff --git
a/lib/lib.c
b/lib/lib.c
index
aca70c4
..
64c8569
100644
(file)
--- a/
lib/lib.c
+++ b/
lib/lib.c
@@
-11,7
+11,7
@@
#include "toys.h"
-#if
ndef __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
baa5268
..
37a94a5
100644
(file)
--- a/
lib/lib.h
+++ b/
lib/lib.h
@@
-31,7
+31,7
@@
struct dirtree {
void get_optflags(void);
// functions.c
-#if
ndef __UCLIBC__
+#if
!defined(__UCLIBC__) && !defined(__KLIBC__)
void strlcpy(char *dest, char *src, size_t size);
#endif