php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #69431
Patch 0001-Fix-compile-error-when-oniguruma-is-not-available.patch revision 2015-04-12 10:43 UTC by lauri dot kentta+php-bugs at gmail dot com
revision 2015-04-12 10:41 UTC by lauri dot kentta+php-bugs at gmail dot com

Patch 0001-Fix-compile-error-when-oniguruma-is-not-available.patch for Compile Failure Bug #69431

Patch version 2015-04-12 10:43 UTC

Return to Bug #69431 | Download this patch
This patch renders other patches obsolete

Obsolete patches:

Patch Revisions:

Developer: lauri.kentta+php-bugs@gmail.com

From 477e340d94c5a616208a8448ced86bcfd2ee959c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20Kentt=C3=A4?= <lauri.kentta@gmail.com>
Date: Sun, 12 Apr 2015 12:38:36 +0300
Subject: [PATCH] Fix compile error when oniguruma is not available

---
 ext/mbstring/mbstring.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 857ad70..8ade984 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1716,11 +1716,13 @@ PHP_MINFO_FUNCTION(mbstring)
 		snprintf(tmp, sizeof(tmp), "%d.%d.%d", MBFL_VERSION_MAJOR, MBFL_VERSION_MINOR, MBFL_VERSION_TEENY);
 		php_info_print_table_row(2, "libmbfl version", tmp);
 	}
+#if HAVE_ONIG
 	{
 		char tmp[256];
 		snprintf(tmp, sizeof(tmp), "%d.%d.%d", ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY);
 		php_info_print_table_row(2, "oniguruma version", tmp);
 	}
+#endif
 	php_info_print_table_end();
 
 	php_info_print_table_start();
-- 
2.3.5

 
PHP Copyright © 2001-2024 The PHP Group
All rights reserved.
Last updated: Sat May 18 15:01:33 2024 UTC