summaryrefslogtreecommitdiffstats
path: root/tools/include
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-08-23 15:35:47 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-08-23 15:35:47 -0300
commitce90c12d2453aa6be743719bb0a5d4040b92700f (patch)
treedd111294114bc286217cb21d3fee47c494de2e81 /tools/include
parentb6a32f023fcc9cbd1602f78a467fd8d41bbc9457 (diff)
parentde737f33ab23b213650c624e79ee479f12e3c500 (diff)
downloadlinux-stable-ce90c12d2453aa6be743719bb0a5d4040b92700f.tar.gz
linux-stable-ce90c12d2453aa6be743719bb0a5d4040b92700f.tar.bz2
linux-stable-ce90c12d2453aa6be743719bb0a5d4040b92700f.zip
Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include')
-rw-r--r--tools/include/linux/string.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index b96879477311..f436d2420a18 100644
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@ -8,7 +8,11 @@ void *memdup(const void *src, size_t len);
int strtobool(const char *s, bool *res);
-#ifdef __GLIBC__
+/*
+ * glibc based builds needs the extern while uClibc doesn't.
+ * However uClibc headers also define __GLIBC__ hence the hack below
+ */
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
extern size_t strlcpy(char *dest, const char *src, size_t size);
#endif