From patchwork Sun Apr 19 11:42:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 6321 Received: (qmail 2135 invoked by alias); 19 Apr 2015 11:42:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 2116 invoked by uid 89); 19 Apr 2015 11:42:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: BLU004-OMC2S12.hotmail.com Received: from blu004-omc2s12.hotmail.com (HELO BLU004-OMC2S12.hotmail.com) (65.55.111.87) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA256 encrypted) ESMTPS; Sun, 19 Apr 2015 11:42:47 +0000 Received: from BLU437-SMTP66 ([65.55.111.71]) by BLU004-OMC2S12.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.22751); Sun, 19 Apr 2015 04:42:45 -0700 X-TMN: [yXBshZqeGvoyMN5OzuqJ6NSh3SFlUQcY] Message-ID: Date: Sun, 19 Apr 2015 19:42:55 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: binutils@sourceware.org, "gdb-patches@sourceware.org" Subject: [PATCH] readline: rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled. On fedora 20 x86_64, it has wcwidth() in libc.so.6, but does not declare it if __USE_XOPEN disabled. readline uses libc library, but does not use XOPEN, so just declare wcwidth() explicitly is OK. The related warning: gcc -c -DHAVE_CONFIG_H -I. -I../../binutils-gdb/readline -DRL_LIBRARY_VERSION='"6.2"' -g -O2 ../../binutils-gdb/readline/display.c ../../binutils-gdb/readline/display.c: In function ‘rl_redisplay’: ../../binutils-gdb/readline/display.c:768:15: warning: implicit declaration of function ‘wcwidth’ [-Wimplicit-function-declaration] temp = wcwidth (wc); ^ 2015-04-19 Chen Gang * rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled. --- readline/ChangeLog.gdb | 4 ++++ readline/rlmbutil.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb index 43abd19..a1051aa 100644 --- a/readline/ChangeLog.gdb +++ b/readline/ChangeLog.gdb @@ -1,3 +1,7 @@ +2015-04-19 Chen Gang + + * rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled. + 2014-12-30 Eli Zaretskii * complete.c (stat_char) [_WIN32]: Don't use 'access' and X_OK on diff --git a/readline/rlmbutil.h b/readline/rlmbutil.h index 7716a70..e4cd1f4 100644 --- a/readline/rlmbutil.h +++ b/readline/rlmbutil.h @@ -96,6 +96,9 @@ extern int _rl_find_next_mbchar PARAMS((char *, int, int, int)); #ifdef HANDLE_MULTIBYTE +extern int wcwidth (wchar_t __c); /* For fedora 20 x86_64, it has wcwitdh(), but + only declared when __USE_XOPEN. */ + extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *, int, mbstate_t *)); extern int _rl_get_char_len PARAMS((char *, mbstate_t *)); extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *));