From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16534 invoked by alias); 28 Aug 2017 14:43:46 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Received: (qmail 3082 invoked by uid 89); 28 Aug 2017 14:43:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,FOREIGN_BODY,GIT_PATCH_2,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=no version=3.3.2 spammy=H*x:zclient, H*UA:zclient, diese, holidays X-HELO: dedi548.your-server.de Received: from dedi548.your-server.de (HELO dedi548.your-server.de) (85.10.215.148) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 Aug 2017 14:43:32 +0000 Received: from [88.198.220.132] (helo=sslproxy03.your-server.de) by dedi548.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_2) (envelope-from ) id 1dmLGE-0006og-8O for newlib@sourceware.org; Mon, 28 Aug 2017 16:43:30 +0200 Received: from [82.135.62.35] (helo=mail.embedded-brains.de) by sslproxy03.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dmLGD-0000kq-Oq for newlib@sourceware.org; Mon, 28 Aug 2017 16:43:29 +0200 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id A6AE12A0A9D for ; Mon, 28 Aug 2017 16:43:25 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id LRjmeg-6p5Px for ; Mon, 28 Aug 2017 16:43:25 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 6E3162A1677 for ; Mon, 28 Aug 2017 16:43:25 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id D6ne2ZqM4nNQ for ; Mon, 28 Aug 2017 16:43:25 +0200 (CEST) Received: from zimbra.eb.localhost (zimbra.eb.localhost [192.168.96.204]) by mail.embedded-brains.de (Postfix) with ESMTP id 607442A166C for ; Mon, 28 Aug 2017 16:43:25 +0200 (CEST) Date: Mon, 28 Aug 2017 14:59:00 -0000 From: Sebastian Huber To: newlib@sourceware.org Message-ID: <1281337601.2137.1503931405363.JavaMail.zimbra@embedded-brains.de> In-Reply-To: <20170828084021.GC18275@calimero.vinschen.de> References: <1503646539-20199-1-git-send-email-1473996754@qq.com> <20170825160248.GE7636@calimero.vinschen.de> <457062177.160690.1503683796167.JavaMail.zimbra@embedded-brains.de> <20170828084021.GC18275@calimero.vinschen.de> Subject: Re: [PATCH v3 1/2] Import strnstr.c from FreeBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2017/txt/msg00904.txt.bz2 ----- Corinna Vinschen schrieb: > 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 > > 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 > > --- > > newlib/libc/iconv/lib/aliasesi.c | 43 ---------------------------------------- > > Thanks for catching, please push. I am on holidays this week and don't have access to my SSH key. -- Sebastian Huber, embedded brains GmbH Address : Dornierstr. 4, D-82178 Puchheim, Germany Phone : +49 89 189 47 41-16 Fax : +49 89 189 47 41-09 E-Mail : sebastian.huber at embedded-brains.de PGP : Public key available on request. Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.