com php-src: Fix compile error when oniguruma is not available: ext/mbstring/mbstring.c
| From: | Anatol Belski | Date: | Mon, 13 Apr 2015 08:11:38 +0000 |
| Subject: | com php-src: Fix compile error when oniguruma is not available: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86166@lists.php.net to get a copy of this message | ||
Commit: 533c4be0d55cf4a6086beab84e5d3ccdbeeb5314
Author: Lauri Kenttä <lauri.kentta@gmail.com> Sun, 12 Apr 2015 12:38:36 +0300
Committer: Anatol Belski <ab@php.net> Mon, 13 Apr 2015 10:11:38 +0200
Parents: 0981345734f05d65dce3b52cefa3a393995ab0ce
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=533c4be0d55cf4a6086beab84e5d3ccdbeeb5314
Log:
Fix compile error when oniguruma is not available
Changed paths:
M ext/mbstring/mbstring.c
Diff:
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();