| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From 9bb386018257e1e18ffe0e925201946515b31080 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
| 3 | Date: Thu, 19 Apr 2018 00:28:14 +0200 |
| 4 | Subject: [PATCH] purgatory/string.c: avoid inclusion of string.h |
| 5 | |
| 6 | Fix |
| 7 | |
| 8 | purgatory/string.c:39:5: error: conflicting types for 'memcmp' |
| 9 | |
| 10 | Upstream-Status: Inappropriate [klibc specific] |
| 11 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
| 12 | |
| 13 | --- |
| 14 | purgatory/string.c | 2 ++ |
| 15 | 1 file changed, 2 insertions(+) |
| 16 | |
| 17 | diff --git a/purgatory/string.c b/purgatory/string.c |
| 18 | index f06c460..c5e978a 100644 |
| 19 | --- a/purgatory/string.c |
| 20 | +++ b/purgatory/string.c |
| 21 | @@ -1,5 +1,7 @@ |
| 22 | #include <stddef.h> |
| 23 | +#ifndef __KLIBC__ |
| 24 | #include <string.h> |
| 25 | +#endif |
| 26 | |
| 27 | size_t strnlen(const char *s, size_t max) |
| 28 | { |