Remove padding just merged since 7.3 isn't released yet.

Also bump PHP_API_VERSION since the struct size has changed.

diff --git a/main/php.h b/main/php.h
index b2e6c581df07a458bd7fc795c4da81565696ae88..7fd975d35146b17cf854ac5fcf03be7378825eaa 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -26,7 +26,7 @@
 #include <dmalloc.h>
 #endif
 
-#define PHP_API_VERSION 20170718
+#define PHP_API_VERSION 20180123
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 #define PHP_DEFAULT_CHARSET "UTF-8"

diff --git a/main/php_globals.h b/main/php_globals.h
index 5b499cad65993e3c7df4868982f4e5d11fba0004..c677a9e29cfd6bd45566e1cb9b5e0be20fc4d270 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -106,12 +106,7 @@ struct _php_core_globals {
        HashTable rfc1867_protected_variables;
 
        short connection_status;
-
-       /* In 7.1/7.2 branches, this was initially a short,
-        * maintain struct alignment with subsequent padding.
-        */
        zend_bool ignore_user_abort;
-       char ignore_user_abort_reserved_padding;
 
        unsigned char header_is_being_sent;