summaryrefslogtreecommitdiff
path: root/zend/compileroptions.h
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-01-12 18:40:12 +0100
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-01-12 18:40:12 +0100
commita3007b9915a0ca3eec024b714cecc609e6356e17 (patch)
treee643f7ae433dbf12e6e1828950d694b855e4ec0a /zend/compileroptions.h
parent74388e2735e806837cd31052c513451ec3942c0a (diff)
fixed compiling in ZTS environments (reported in issue #57)
Diffstat (limited to 'zend/compileroptions.h')
-rw-r--r--zend/compileroptions.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/zend/compileroptions.h b/zend/compileroptions.h
index 798cb59..74ba053 100644
--- a/zend/compileroptions.h
+++ b/zend/compileroptions.h
@@ -25,19 +25,32 @@ private:
* @var int
*/
zend_uint _original;
+
+#ifdef ZTS
+ /**
+ * When in thread safety mode, we also keep track of the TSRM_LS var
+ * @var void***
+ */
+ void ***tsrm_ls;
+#endif
public:
/**
* Constructor
* @param options
*/
- CompilerOptions(zend_uint options)
+ CompilerOptions(zend_uint options TSRMLS_DC)
{
// remember the old compiler options before we set temporary compile options
_original = CG(compiler_options);
// we're going to evaluate only once
CG(compiler_options) = options;
+
+#ifdef ZTS
+ // copy tsrm_ls param
+ this->tsrm_ls = tsrm_ls;
+#endif
}
/**