From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed, 4 Jul 2018 20:26:22 +0000 (-0300)
Subject: posix: Fix bug-regex33 after regex sync
X-Git-Tag: glibc-2.28~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1002d708232dda9ebff65f6c1409fa067a01b6e0;p=thirdparty%2Fglibc.git

posix: Fix bug-regex33 after regex sync

On some platforms the inclusion of regex-internal.h in bug-regex33
testcase show a MAX redefinition if test-skeleton.c is include later.
This patch fixes by removing regex-internal.h inclusion and using
SBC_MAX value directly.

Checked on aarch64-linux-gnu.

	* posix/bug-regex33.c: Fix build after regex sync.
---

diff --git a/ChangeLog b/ChangeLog
index 9e582627f48..2e8308e1919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-04  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* posix/bug-regex33.c: Fix build after regex sync.
+
 2018-07-04  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #23164]
diff --git a/posix/bug-regex33.c b/posix/bug-regex33.c
index 0313cb4d164..015b73c1d1e 100644
--- a/posix/bug-regex33.c
+++ b/posix/bug-regex33.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "regex_internal.h"
 
 static int
 do_test (void)
@@ -39,8 +38,9 @@ do_test (void)
   memset (&r, 0, sizeof (r));
   memset (&s, 0, sizeof (s));
 
-  /* The bug cannot be reproduced without initialized fastmap. */
-  r.fastmap = malloc (SBC_MAX);
+  /* The bug cannot be reproduced without initialized fastmap (it is SBC_MAX
+     value from regex_internal.h).  */
+  r.fastmap = malloc (UCHAR_MAX + 1);
 
                      /* 圭 */
   re_compile_pattern ("\xb7\xbd", 2, &r);