com php-src: Merge branch 'PHP-7.4': TSRM/TSRM.c TSRM/TSRM.h ext/standard/basic_functions.c
| From: | Joe Watkins | Date: | Fri, 29 Mar 2019 18:06:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': TSRM/TSRM.c TSRM/TSRM.h ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105405@lists.php.net to get a copy of this message | ||
Commit: abd0e015a8d126a8efee4b3625b500053ae9827d
Author: Joe Watkins <krakjoe@php.net> Fri, 29 Mar 2019 19:06:59 +0100
Parents: 4006e995772fca4ae2821a0259693901dd229c68 072eb6dd77b079a6f90ca5b155f9b0add1b5f2d4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abd0e015a8d126a8efee4b3625b500053ae9827d
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
tsrm environment lock
Changed paths:
MM TSRM/TSRM.c
MM TSRM/TSRM.h
MM ext/standard/basic_functions.c
Diff:
diff --cc TSRM/TSRM.h
index 22ccf61,5e1f816...d5d9065
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@@ -175,6 -209,13 +179,9 @@@ TSRM_API const char *tsrm_api_name(void
#else /* non ZTS */
+ #define tsrm_env_lock() 0
+ #define tsrm_env_unlock() 0
+
-#define TSRMLS_FETCH()
-#define TSRMLS_FETCH_FROM_CTX(ctx)
-#define TSRMLS_SET_CTX(ctx)
-
#define TSRMG_STATIC(id, type, element)
#define TSRMLS_CACHE_EXTERN()
#define TSRMLS_CACHE_DEFINE()