Fix [-Wundef] warning in MBString extension

Author: Girgias

ext/mbstring/mbstring.c

@@ -53,12 +53,12 @@
 
 #include "mb_gpc.h"
 
-#if HAVE_MBREGEX
+#ifdef HAVE_MBREGEX
 # include "php_mbregex.h"
 # include "php_onig_compat.h"
 # include <oniguruma.h>
 # undef UChar
-#if ONIGURUMA_VERSION_INT < 60800
+# if !defined(ONIGURUMA_VERSION_INT) || ONIGURUMA_VERSION_INT < 60800
 typedef void OnigMatchParam;
 #define onig_new_match_param() (NULL)
 #define onig_initialize_match_param(x) (void)(x)
@@ -69,7 +69,7 @@ typedef void OnigMatchParam;
 onig_search(reg, str, end, start, range, region, option)
 #define onig_match_with_param(re, str, end, at, region, option, mp) \
 onig_match(re, str, end, at, region, option)
-#endif
+# endif
 #else
 # include "ext/pcre/php_pcre.h"
 #endif

ext/mbstring/mbstring.h

@@ -45,7 +45,7 @@
 #endif
 
 
-#if HAVE_MBSTRING
+#ifdef HAVE_MBSTRING
 
 #include "libmbfl/mbfl/mbfilter.h"
 #include "SAPI.h"
@@ -108,7 +108,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	size_t illegalchars;
 	mbfl_buffer_converter *outconv;
     void *http_output_conv_mimetypes;
-#if HAVE_MBREGEX
+#ifdef HAVE_MBREGEX
     struct _zend_mb_regex_globals *mb_regex_globals;
     zend_long regex_stack_limit;
 #endif
@@ -118,7 +118,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	zend_bool internal_encoding_set;
 	zend_bool http_output_set;
 	zend_bool http_input_set;
-#if HAVE_MBREGEX
+#ifdef HAVE_MBREGEX
     zend_long regex_retry_limit;
 #endif
 ZEND_END_MODULE_GLOBALS(mbstring)

ext/mbstring/php_mbregex.c

@@ -21,7 +21,7 @@
 #include "php.h"
 #include "php_ini.h"
 
-#if HAVE_MBREGEX
+#ifdef HAVE_MBREGEX
 
 #include "zend_smart_str.h"
 #include "ext/standard/info.h"
@@ -33,7 +33,7 @@
 #include <oniguruma.h>
 #undef UChar
 
-#if ONIGURUMA_VERSION_INT < 60800
+#if !defined(ONIGURUMA_VERSION_INT) || ONIGURUMA_VERSION_INT < 60800
 typedef void OnigMatchParam;
 #define onig_new_match_param() (NULL)
 #define onig_initialize_match_param(x) (void)(x)

ext/mbstring/php_mbregex.h

@@ -17,7 +17,7 @@
 #ifndef _PHP_MBREGEX_H
 #define _PHP_MBREGEX_H
 
-#if HAVE_MBREGEX
+#ifdef HAVE_MBREGEX
 
 #include "php.h"
 #include "zend.h"