Fixed ZTS build. Needed to bump API version number.

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 335eecdb1e991c82aa0dacf45061b8b15e0c3721..3ef28804e68e3297b39faeeb3d7c3b7548cf6e38 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -28,7 +28,7 @@
 /* The first number is the engine version and the rest is the date.
  * This way engine 2/3 API no. is always greater than engine 1 API no..
  */
-#define ZEND_EXTENSION_API_NO  220131107
+#define ZEND_EXTENSION_API_NO  220131218
 
 typedef struct _zend_extension_version_info {
        int zend_extension_api_no;

diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 919f4a9ab13270a96e12be59a67b01e3eefc60f3..835c9ee7162a0b244b49762f4d41244e95451069 100644 (file)
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1465,7 +1465,7 @@ static void zend_jmp_optimization(zend_code_block *block, zend_op_array *op_arra
                case ZEND_JMPNZ:
                        /* constant conditional JMPs */
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
 #else
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op));
@@ -1613,7 +1613,7 @@ next_target:
                case ZEND_JMPZ_EX:
                        /* constant conditional JMPs */
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
 #else
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op));
@@ -1739,7 +1739,7 @@ next_target_ex:
                        }
 
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                if (!zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC)) {
 #else
                                if (!zend_is_true(&ZEND_OP1_LITERAL(last_op))) {

diff --git a/ext/opcache/Optimizer/pass2.c b/ext/opcache/Optimizer/pass2.c
index 0f747aaabaf3ddc51d18bcf9edcb75811d340102..d5f4f0492bd1d7b21d853ff2f549835683959a81 100644 (file)
--- a/ext/opcache/Optimizer/pass2.c
+++ b/ext/opcache/Optimizer/pass2.c
@@ -89,7 +89,7 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                                /* convert Ti = JMPZ_EX(C, L) => Ti = QM_ASSIGN(C)
                                   in case we know it wouldn't jump */
                                } else if (ZEND_OP1_TYPE(opline) == IS_CONST) {
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC);
 #else
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
@@ -107,7 +107,7 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                        case ZEND_JMPZ:
                        case ZEND_JMPNZ:
                                if (ZEND_OP1_TYPE(opline) == IS_CONST) {
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC);
 #else
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
@@ -147,7 +147,7 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                        case ZEND_JMPZNZ:
                                if (ZEND_OP1_TYPE(opline) == IS_CONST) {
                                        int opline_num;
-#if PHP_API_VERSION > PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO > PHP_5_6_X_API_NO
                                        if (zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC)) {
 #else
                                        if (zend_is_true(&ZEND_OP1_LITERAL(opline))) {

diff --git a/main/php.h b/main/php.h
index ed8a2bb08e5dc1a60840a67f07f87c7e0a66d85e..bfa148def3342a1338c8b797ecf44aa330b09a27 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -26,7 +26,7 @@
 #include <dmalloc.h>
 #endif
 
-#define PHP_API_VERSION 20131106
+#define PHP_API_VERSION 20131218
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0