jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PHP compilation error in ZTS mode (64 bit windows) due to TSRMLS_FETCH() expansion

Browse source
This commit is contained in:
William S Fulton 2014-01-16 06:42:34 +00:00
commit f068be89e5
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.0 (in progress) Version 3.0.0 (in progress)
============================ ============================
2014-01-16: wsfulton
[PHP] Fix compilation error in ZTS mode (64 bit windows) due to incorrect placement
of TSRMLS_FETCH() in SWIG_Php_GetModule() as reported by Mark Dawson-Butterworth.
2014-01-14: diorcety 2014-01-14: diorcety
Patch #112 - Fix symbol resolution involving scopes that have multiple levels Patch #112 - Fix symbol resolution involving scopes that have multiple levels
of typedefs - fixes some template resolutions as well as some typemap searches. of typedefs - fixes some template resolutions as well as some typemap searches.

3
Lib/php/phprun.swg
View file

@ -255,11 +255,10 @@ static char const_name[] = "swig_runtime_data_type_pointer";
static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) { static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
zval *pointer; zval *pointer;
swig_module_info *ret = 0; swig_module_info *ret = 0;
TSRMLS_FETCH();
MAKE_STD_ZVAL(pointer); MAKE_STD_ZVAL(pointer);
TSRMLS_FETCH();
if (zend_get_constant(const_name, sizeof(const_name) - 1, pointer TSRMLS_CC)) { if (zend_get_constant(const_name, sizeof(const_name) - 1, pointer TSRMLS_CC)) {
if (pointer->type == IS_LONG) { if (pointer->type == IS_LONG) {
ret = (swig_module_info *) pointer->value.lval; ret = (swig_module_info *) pointer->value.lval;