summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.current4
-rw-r--r--Lib/php/phprun.swg3
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;