1*4882a593SmuzhiyunFrom 9bb386018257e1e18ffe0e925201946515b31080 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Andrea Adami <andrea.adami@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 19 Apr 2018 00:28:14 +0200 4*4882a593SmuzhiyunSubject: [PATCH] purgatory/string.c: avoid inclusion of string.h 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFix 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun purgatory/string.c:39:5: error: conflicting types for 'memcmp' 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUpstream-Status: Inappropriate [klibc specific] 11*4882a593SmuzhiyunSigned-off-by: Andrea Adami <andrea.adami@gmail.com> 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun purgatory/string.c | 2 ++ 15*4882a593Smuzhiyun 1 file changed, 2 insertions(+) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/purgatory/string.c b/purgatory/string.c 18*4882a593Smuzhiyunindex f06c460..c5e978a 100644 19*4882a593Smuzhiyun--- a/purgatory/string.c 20*4882a593Smuzhiyun+++ b/purgatory/string.c 21*4882a593Smuzhiyun@@ -1,5 +1,7 @@ 22*4882a593Smuzhiyun #include <stddef.h> 23*4882a593Smuzhiyun+#ifndef __KLIBC__ 24*4882a593Smuzhiyun #include <string.h> 25*4882a593Smuzhiyun+#endif 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun size_t strnlen(const char *s, size_t max) 28*4882a593Smuzhiyun { 29