From patchwork Fri Dec  8 09:16:59 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arnold Robbins <arnold@skeeve.com>
X-Patchwork-Id: 24805
Received: (qmail 101714 invoked by alias); 8 Dec 2017 09:21:54 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 101573 invoked by uid 89); 8 Dec 2017 09:21:54 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	KAM_LAZY_DOMAIN_SECURITY, MANY_HDRS_LCASE,
	RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2
	spammy=HContent-type:text, Hx-spam-relays-external:ESMTPA
X-HELO: mxout4.netvision.net.il
MIME-version: 1.0
Content-transfer-encoding: 7BIT
Content-type: text/plain; CHARSET=US-ASCII
From: Arnold Robbins <arnold@skeeve.com>
Message-id: <201712080916.vB89GxOG005507@skeeve.com>
Date: Fri, 08 Dec 2017 11:16:59 +0200
To: carlos@redhat.com, libc-alpha@sourceware.org
Subject: [PATCH 09/17] Regex: Add undefs of various routines and macros.
User-Agent: Heirloom mailx 12.5 6/20/10

This patch adds undefs for various routines and macros, making the
code more consistent.

2017-11-27         Arnold D. Robbins     <arnold@skeeve.com>

	* posix/regex_internal.h: Add undefs of various routines / macros.

diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index e9cc2b6..e07a44a 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -97,6 +97,10 @@
 # define BE(expr, val) __builtin_expect (expr, val)
 #else
 # define BE(expr, val) (expr)
+# ifdef inline
+# undef inline
+# endif
+# define inline
 #endif
 
 /* Number of single byte character.  */
@@ -110,10 +114,17 @@
 
 /* Rename to standard API for using out of glibc.  */
 #ifndef _LIBC
+# ifdef __wctype
+# undef __wctype
+# endif
 # define __wctype wctype
+# ifdef __iswctype
+# undef __iswctype
+# endif
 # define __iswctype iswctype
 # define __btowc btowc
 # define __mbrtowc mbrtowc
+#undef __mempcpy
 # define __mempcpy mempcpy
 # define __wcrtomb wcrtomb
 # define __regfree regfree