com php-src: Increased number of reserved resources (from 4 to 6): Zend/zend.h Zend/zend_portability.h
| From: | Dmitry Stogov | Date: | Mon, 12 Dec 2016 08:51:12 +0000 |
| Subject: | com php-src: Increased number of reserved resources (from 4 to 6): Zend/zend.h Zend/zend_portability.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96303@lists.php.net to get a copy of this message | ||
Commit: 668970440353f204a8504dd0bbbc76d6cac9657e
Author: Dmitry Stogov <dmitry@zend.com> Mon, 12 Dec 2016 11:51:12 +0300
Parents: 2d52d787412e6a85791c9c700edf999a27b1d6a6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=668970440353f204a8504dd0bbbc76d6cac9657e
Log:
Increased number of reserved resources (from 4 to 6)
Changed paths:
M Zend/zend.h
M Zend/zend_portability.h
Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index c33ddef..59d906d 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -26,8 +26,6 @@
#define ZEND_ENGINE_3
-#define ZEND_MAX_RESERVED_RESOURCES 4
-
#include "zend_types.h"
#include "zend_errors.h"
#include "zend_alloc.h"
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index bf3edfe..eafb757 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -472,7 +472,7 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
#define ZEND_TRUTH(x) ((x) ? 1 : 0)
#define ZEND_LOG_XOR(a, b) (ZEND_TRUTH(a) ^ ZEND_TRUTH(b))
-#define ZEND_MAX_RESERVED_RESOURCES 4
+#define ZEND_MAX_RESERVED_RESOURCES 6
/* excpt.h on Digital Unix 4.0 defines function_table */
#undef function_table