diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-27 12:35:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-27 12:35:35 +0200 |
| commit | df15929f8f5c69e987c31bf016eca4a38dba46f0 (patch) | |
| tree | cfb5fe5e8ebff4cabd70557a304f355546943cc9 /tools/include/linux/string.h | |
| parent | efaad554b4ffae1840a2759e09e21325ddbc8b05 (diff) | |
| parent | 37e13a1ebe32c4fbfbdb5413f42eb6e71d8b28a4 (diff) | |
Merge branch 'linus' into x86/microcode, to pick up merge window changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include/linux/string.h')
| -rw-r--r-- | tools/include/linux/string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h index e26223f1f287..b96879477311 100644 --- a/tools/include/linux/string.h +++ b/tools/include/linux/string.h @@ -8,8 +8,10 @@ void *memdup(const void *src, size_t len); int strtobool(const char *s, bool *res); -#ifndef __UCLIBC__ +#ifdef __GLIBC__ extern size_t strlcpy(char *dest, const char *src, size_t size); #endif +char *str_error_r(int errnum, char *buf, size_t buflen); + #endif /* _LINUX_STRING_H_ */ |