From: Sara Golemon <pollita@php.net>
Date: Tue, 23 Jan 2018 16:12:49 +0000 (-0500)
Subject: Remove padding just merged since 7.3 isn't released yet.
X-Git-Tag: php-7.3.0alpha1~553
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df4edde870ef42fdd8397f9d67c6c9b5d9b74bac;p=php

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 b2e6c581df..7fd975d351 100644
--- 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 5b499cad65..c677a9e29c 100644
--- 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;