Re: [PATCH v3 1/2] Import strnstr.c from FreeBSD.

[Corinna Vinschen <vinschen at redhat dot com>]

On Aug 25 19:56, Sebastian Huber wrote:
> This caused a conflict with the iconv support.  See attached patch.

> From 754f598a0a0dbde072a5baa3d4c3374333326c76 Mon Sep 17 00:00:00 2001
> From: Sebastian Huber <sebastian.huber@embedded-brains.de>
> Date: Fri, 25 Aug 2017 19:48:42 +0200
> Subject: [PATCH] Fix compile error due to new strnstr()
> 
> Remove local strnstr() implementation to fix compile error:
> 
> newlib/libc/iconv/lib/aliasesi.c:53:8: error: conflicting types for 'strnstr'
>  _DEFUN(strnstr, (haystack, needle, length),
>         ^
> In file included from newlib/libc/iconv/lib/aliasesi.c:29:0:
> newlib/libc/include/string.h:125:10:
> note: previous declaration of 'strnstr' was here
>  char    *strnstr(const char *, const char *, size_t) __pure;
>           ^~~~~~~
> 
> Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
> ---
>  newlib/libc/iconv/lib/aliasesi.c | 43 ----------------------------------------

Thanks for catching, please push.


Corinna


-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

Attachment: signature.asc
Description: PGP signature