From 8231031995187d2220b5be40bfc35dcbb9df720b Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 21 Feb 2005 09:45:19 +0000
Subject: [PATCH] - MFH: fix bug #29989 (type re_registers redefined in
 oniguruma.h)

---
 NEWS                                     | 1 +
 ext/mbstring/oniguruma/php_onig_compat.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index b8f497f9aa..49d8f4c2fe 100644
--- a/NEWS
+++ b/NEWS
@@ -109,6 +109,7 @@ PHP                                                                        NEWS
   in segfault). (pdan-php at esync dot org, Tony)
 - Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many
   parameters). (Jani)
+- Fixed bug #29989 (type re_registers redefined in oniguruma.h). (Moriyoshi)
 - Fixed bug #29767 (Weird behaviour of __set($name, $value)). (Dmitry)
 - Fixed bug #29733 (printf() handles repeated placeholders wrong).
   (bugs dot php dot net at bluetwanger dot de, Ilia)
diff --git a/ext/mbstring/oniguruma/php_onig_compat.h b/ext/mbstring/oniguruma/php_onig_compat.h
index d7f1ad56f1..1de0d6073d 100644
--- a/ext/mbstring/oniguruma/php_onig_compat.h
+++ b/ext/mbstring/oniguruma/php_onig_compat.h
@@ -3,5 +3,6 @@
 
 #define re_pattern_buffer           php_mb_re_pattern_buffer
 #define regex_t                     php_mb_regex_t
+#define re_registers                php_mb_re_registers
 
 #endif /* _PHP_MBREGEX_COMPAT_H */
-- 
2.40.0