From patchwork Mon Jan 18 06:28:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 569451 X-Patchwork-Delegate: jow@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 91F38140AD9 for ; Mon, 18 Jan 2016 17:29:04 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1A0DB28C0F0; Mon, 18 Jan 2016 07:28:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8099B28C0EF for ; Mon, 18 Jan 2016 07:28:12 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 18 Jan 2016 07:28:11 +0100 (CET) Received: from LT001.fritz.box ([37.24.8.189]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0ML72n-1aLKQA4Bzl-000IZp; Mon, 18 Jan 2016 07:28:48 +0100 From: Heinrich Schuchardt To: openwrt-devel@lists.openwrt.org Date: Mon, 18 Jan 2016 07:28:35 +0100 Message-Id: <1453098515-3526-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:9SwI1hia58h9HOb+6ndwMRcxSm6uNujt47pnn3xkDzBOJC68Cty q5nNEtveRiGeJtFnPqOanD5MO+YpwR1Kkp8vswM0vZridaKmWu/xvTNwHA6ftEXxRpm5HYa 21XQQTDtieskibThOiaf/Rdf6aSlrczJjvZU1sB/whENYuIyuIsjj6XsDO+UK33sI1zx66p M6nHlZLZOD2bAW6h8hEXQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:jWonMU2jwkk=:Y+DC8a0J+77HSiO7MqJSuP p/91qHeOh9lUxwE8q/+93S1SBZfz/yP6gGG8KwkEnaDtC9hjSWrRDpNxW/KMFlnoRm4Yh7Hln D1iU5aC42LfV9juVBYMbuO2v2oSvcSXeQiCW2w8Q5AkRFtFLDRDzDUohqGLK2dxY9nbPrTYvC v7mPYU4JRXdWeaIu+UHNvmiowWZJHhkOOitJTb50xzEhInoCFVHD5GsFiE8xM9HbT7Vq2oi8A hKgUp3+lwv2lylsYd5sxSSzKewc+/+Zam1hJHSYXnKwfXZ4RJmuZAV79RESBCRN1TLSvUGsDH 4cYtiEXrUWusWdK4NNyaraPgO1TSpIJDIdbC4LMEFnaKRuauiTHIam7UmAlJnBI8yIUBoXsvX CZ/TBWBxGo6pl1RhuBNz4esdrhhqY17hHb1VILw9zHiW/bHnO6UGDTiNlWiC5iYTa572eYH35 ebZMynFWnJCT7yDQce8UAgItZCRig63Plfd4C2LiQn+odT2uIQM2rbI/YKgmts2VxGIESPZdb JqkQTdZQJH7zHL9UVft8iE+Ymv8VY96RJ0xtrywVRsPzYvEPkp60JdHoZuFR9/Gqe2f3Xk0Qg MenIXU7VgoGNBui2TtZVgIz1Act4RDeX5vmMtrZ0HztZQUyxUVZw6dfIvGlfqYlgemEIWH2Uw MV6eWJcK8T/iciyTveeLz0ZNfdSDjH0EOuDVelKeRnerDLpgatv4nwcLNirUyGHh3EQWJVD89 9Oc+keCJjlDfRh8zGpTHOpCQuNE6w9cu6Wo3V5uCv4w2Ffk/S1Uz2pE/Qew= Cc: Heinrich Schuchardt , Steven Barth , Hamish Guthrie Subject: [OpenWrt-Devel] [PATCH 1/1] package/libs/libiconv: function names X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Currently libiconv-stub and libiconv-full use different names for functions iconv, iconv_open, and iconv_close. This may lead to failures when building modules, e.g. with apr-util when NLS is not activated. The two modules libiconv-stub and libiconv-full should be interchangeable, so we need the same function names. cf. http://git.savannah.gnu.org/cgit/libiconv.git/tree/include/iconv.h.in After applying this patch execute make distclean Signed-off-by: Heinrich Schuchardt --- package/libs/libiconv/src/include/iconv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libs/libiconv/src/include/iconv.h b/package/libs/libiconv/src/include/iconv.h index dfab27f..64acb6f 100644 --- a/package/libs/libiconv/src/include/iconv.h +++ b/package/libs/libiconv/src/include/iconv.h @@ -13,6 +13,10 @@ extern int _libiconv_version; /* Likewise */ typedef long iconv_t; +#define iconv_open libiconv_open +#define iconv libiconv +#define iconv_close libiconv_close + extern iconv_t iconv_open(const char *tocode, const char *fromcode);