From patchwork Mon Feb 3 21:55:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 1233034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=uclibc-ng.org (client-ip=2a00:1828:2000:679::23; helo=helium.openadk.org; envelope-from=devel-bounces@uclibc-ng.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AAtV2z7/; dkim-atps=neutral Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48BM8V2jnwz9sRW for ; Tue, 4 Feb 2020 08:55:52 +1100 (AEDT) Received: from helium.openadk.org (localhost [IPv6:::1]) by helium.openadk.org (Postfix) with ESMTP id 7D71B100EA; Mon, 3 Feb 2020 22:55:43 +0100 (CET) X-Original-To: devel@uclibc-ng.org Delivered-To: devel@helium.openadk.org Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by helium.openadk.org (Postfix) with ESMTPS id 3911E100EA for ; Mon, 3 Feb 2020 22:55:42 +0100 (CET) Received: by mail-lj1-f196.google.com with SMTP id v17so16320182ljg.4 for ; Mon, 03 Feb 2020 13:55:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JcDDIqcfJawaSmDJHmbv9kK4ohGI6BQ6+ghiyE4fyag=; b=AAtV2z7/ICaxGdzbk0KfzqAI41XlVJ6G3ZetaADJcTJNKbECpRIglm0N3fAAuRv/Q9 iJc0iWTze0CTHAmztvjAnrnPj25YMspbaP22w7QGF57LR1MQgCdwAq/4D2oT4PO6cg9u kEQY9cCmAEW3abUWY4WMDRRweWOkuB4hGn2bt3MVu97vyWY2+Unogd9NoSk9v1OEypUo wynJjHaZjHXtGVcfgMKWghPsREhnSABb5Hn00bxfF5Sv/2QTvgz8q2gT6oTOosTCD4BA 743ycyJswOxKe7zLyHmqBBurxrb7zu9uU0chJxkZJKrzgB1WeR6rkL72iZL/by8dhgJP 7HHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JcDDIqcfJawaSmDJHmbv9kK4ohGI6BQ6+ghiyE4fyag=; b=VcwVfE9vnravkJ7HgQG6F9/2I2eVSk+fPCPvvYvm9jTL2j4JHHML6PB9wMH80OpVG1 GiTHuYVsLRviDzg0Yq21cSP8pc/ZM1k50wFQ0cNKgi2xzPii4Kl0Z8wTtI1iHf48subx HVcKHvNTwg3tFH6b3XqvIH1wMBfzf15qC4ZqxvG7XL4dkGEtfkGM99u2t2V2KKYOjg/m f6lgnIw8H/8VoGB5XI+EPuSnG+UuS9TofwOWExSV4bttodN0P38aCCqDA+YcFjxmN+FI jJHRYM8coBQtYI2mc0yUqsJOKoRy9sIrcc7aBWKdHcoU8aS3WD6vjMGNiTb0DNdtib4I Urpg== X-Gm-Message-State: APjAAAUCaRFvayWslQB+Ok/y/0XyiNM+3zPVfPWrmzkNIi34U45xZ++z jTiScWgtgYtSgWoI39/DGANhdUBAqKY= X-Google-Smtp-Source: APXvYqz0oGuHd0HTE2Lszw8h7ish29GQ6/eDTOTJV3gyNoSkg71K18X+THHKp3qyXEDu6aPfj0DtPA== X-Received: by 2002:a2e:884f:: with SMTP id z15mr15544335ljj.46.1580766943244; Mon, 03 Feb 2020 13:55:43 -0800 (PST) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id l22sm10554150lje.40.2020.02.03.13.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 13:55:42 -0800 (PST) From: Max Filippov To: devel@uclibc-ng.org Date: Mon, 3 Feb 2020 13:55:31 -0800 Message-Id: <20200203215531.15516-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: linux-xtensa@linux-xtensa.org, Chris Zankel Subject: [uclibc-ng-devel] [PATCH] include/ctype.h: drop is*_l macro definitions X-BeenThere: devel@uclibc-ng.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: uClibc-ng Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devel-bounces@uclibc-ng.org Sender: "devel" ctype locale-specific macro definitions are broken because they result in dereference of pointer to structure of incomplete type. Drop these macros since they are optional and let applications use functions with the same names. This change fixes parted-3.3 build with uClibc-ng: http://autobuild.buildroot.net/results/b7ba1210d5aa184b133f0171da621d2b0083ec39/build-end.log Signed-off-by: Max Filippov --- include/ctype.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/include/ctype.h b/include/ctype.h index ecd5e730886a..05f21c553e5a 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l) /* Return the uppercase version of C. */ extern int toupper_l (int __c, __locale_t __l) __THROW; -# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus -# define tolower_l(c, locale) __tobody(c, tolower_l, (locale)->__ctype_tolower, (c, locale)) -# define toupper_l(c, locale) __tobody(c, toupper_l, (locale)->__ctype_toupper, (c, locale)) -# endif /* Optimizing gcc */ - - # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type) # ifndef __NO_CTYPE -# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l)) -# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l)) -# define __iscntrl_l(c,l) __isctype_l((c), _IScntrl, (l)) -# define __isdigit_l(c,l) __isctype_l((c), _ISdigit, (l)) -# define __islower_l(c,l) __isctype_l((c), _ISlower, (l)) -# define __isgraph_l(c,l) __isctype_l((c), _ISgraph, (l)) -# define __isprint_l(c,l) __isctype_l((c), _ISprint, (l)) -# define __ispunct_l(c,l) __isctype_l((c), _ISpunct, (l)) -# define __isspace_l(c,l) __isctype_l((c), _ISspace, (l)) -# define __isupper_l(c,l) __isctype_l((c), _ISupper, (l)) -# define __isxdigit_l(c,l) __isctype_l((c), _ISxdigit, (l)) -# define __isblank_l(c,l) __isctype_l((c), _ISblank, (l)) - # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ && defined __UCLIBC_SUSV4_LEGACY__ # define __isascii_l(c,l) ((l), __isascii (c)) # define __toascii_l(c,l) ((l), __toascii (c)) # endif -# define isalnum_l(c,l) __isalnum_l ((c), (l)) -# define isalpha_l(c,l) __isalpha_l ((c), (l)) -# define iscntrl_l(c,l) __iscntrl_l ((c), (l)) -# define isdigit_l(c,l) __isdigit_l ((c), (l)) -# define islower_l(c,l) __islower_l ((c), (l)) -# define isgraph_l(c,l) __isgraph_l ((c), (l)) -# define isprint_l(c,l) __isprint_l ((c), (l)) -# define ispunct_l(c,l) __ispunct_l ((c), (l)) -# define isspace_l(c,l) __isspace_l ((c), (l)) -# define isupper_l(c,l) __isupper_l ((c), (l)) -# define isxdigit_l(c,l) __isxdigit_l ((c), (l)) -# define isblank_l(c,l) __isblank_l ((c), (l)) - # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ && defined __UCLIBC_SUSV4_LEGACY__ # define isascii_l(c,l) __isascii_l ((c), (l))