diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2014-01-16 06:42:34 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2014-02-08 15:08:34 +0000 |
| commit | c569210dd59e252be5176cb3224cc7e354bb97c1 (patch) | |
| tree | 47cb70a4005f2dc2129be2d308fef20afd43ac42 | |
| parent | 78f92962e207c152a40783181aaf0c77e506cb3b (diff) | |
| download | swig-c569210dd59e252be5176cb3224cc7e354bb97c1.tar.gz | |
Fix PHP compilation error in ZTS mode (64 bit windows) due to TSRMLS_FETCH() expansion
Conflicts:
CHANGES.current
| -rw-r--r-- | CHANGES.current | 4 | ||||
| -rw-r--r-- | Lib/php/phprun.swg | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.current b/CHANGES.current index 28b403a6d..d55bb9716 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.12 (9 Feb 2014) =========================== +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-13: kwwette [Octave] update support to Octave version 3.8.0 diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg index a4188cc7c..063b84227 100644 --- a/Lib/php/phprun.swg +++ b/Lib/php/phprun.swg @@ -255,11 +255,10 @@ static char const_name[] = "swig_runtime_data_type_pointer"; static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) { zval *pointer; swig_module_info *ret = 0; + TSRMLS_FETCH(); MAKE_STD_ZVAL(pointer); - TSRMLS_FETCH(); - if (zend_get_constant(const_name, sizeof(const_name) - 1, pointer TSRMLS_CC)) { if (pointer->type == IS_LONG) { ret = (swig_module_info *) pointer->value.lval; |