From: Anatol Belski <ab@php.net>
Date: Sun, 23 Jul 2017 12:13:16 +0000 (+0200)
Subject: Adjust datatypes and reorder which saves 8 bytes on 64-bit
X-Git-Tag: php-7.3.0alpha1~1818
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea83b69883f3f77fd27e4663fa854c88f141ab41;p=php

Adjust datatypes and reorder which saves 8 bytes on 64-bit
---

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 786bb5feb7..6d04072506 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -161,7 +161,6 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint32_t n
 
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	char *internal_encoding_name;
-	enum mbfl_no_language language;
 	const mbfl_encoding *internal_encoding;
 	const mbfl_encoding *current_internal_encoding;
 	const mbfl_encoding *http_output_encoding;
@@ -183,9 +182,10 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	int filter_illegal_substchar;
 	int current_filter_illegal_mode;
 	int current_filter_illegal_substchar;
-	long func_overload;
+	zend_long func_overload;
+	enum mbfl_no_language language;
 	zend_bool encoding_translation;
-	long strict_detection;
+	zend_bool strict_detection;
 	size_t illegalchars;
 	mbfl_buffer_converter *outconv;
     void *http_output_conv_mimetypes;