From b35d3509caee04b2e196bb832138e4e4042347db Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Aug 2018 17:46:32 -0700
Subject: [PATCH] regex: port Gnulib code to z/OS POSIX environment

Problem reported by Arnold Robbins in:
https://lists.gnu.org/r/bug-gnulib/2018-08/msg00129.html
* posix/regex_internal.h (__iswalnum, __towlower, __towupper) [!_LIBC]:
Undef.
---
 ChangeLog              | 8 ++++++++
 posix/regex_internal.h | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 923f1f1d13..39c6bf5867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	regex: port Gnulib code to z/OS POSIX environment
+	Problem reported by Arnold Robbins in:
+	https://lists.gnu.org/r/bug-gnulib/2018-08/msg00129.html
+	* posix/regex_internal.h (__iswalnum, __towlower, __towupper) [!_LIBC]:
+	Undef.
+
 2018-08-22  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/test-double-vlen2.h: Don't include <math-tests-rounding.h>.
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 3b836ed206..c7880667dd 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -149,7 +149,10 @@
 /* Rename to standard API for using out of glibc.  */
 #ifndef _LIBC
 # undef __wctype
+# undef __iswalnum
 # undef __iswctype
+# undef __towlower
+# undef __towupper
 # define __wctype wctype
 # define __iswalnum iswalnum
 # define __iswctype iswctype
-- 
2.11.4.GIT