summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-24 14:54:53 +0100
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-24 14:54:53 +0100
commit42b5a3072d5f2b831cecbc8b8d3e1fb35a47cec4 (patch)
tree9bd8e6d52be240300ff92e82a9560e6033056ddf /src
parentaecf6c450fc4ad9b1b3ee0ce4450b9dac5ce2967 (diff)
fixed compile issues with TSRM enabled
Diffstat (limited to 'src')
-rw-r--r--src/classbase.cpp4
-rw-r--r--src/includes.h4
-rw-r--r--src/object.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/classbase.cpp b/src/classbase.cpp
index eadc4c6..db32601 100644
--- a/src/classbase.cpp
+++ b/src/classbase.cpp
@@ -552,7 +552,7 @@ zend_object_value ClassBase::cloneObject(zval *val TSRMLS_DC)
result.handlers = meta->objectHandlers();
// store the object
- MixedObject *new_object = cpp->store(entry);
+ MixedObject *new_object = cpp->store(entry TSRMLS_CC);
// store the object in the object cache
result.handle = cpp->handle();
@@ -1211,7 +1211,7 @@ zend_object_value ClassBase::createObject(zend_class_entry *entry TSRMLS_DC)
result.handlers = meta->objectHandlers();
// store the object
- cpp->store(entry);
+ cpp->store(entry TSRMLS_CC);
// store the object in the object cache
result.handle = cpp->handle();
diff --git a/src/includes.h b/src/includes.h
index 4bd0aaa..e3ecdb1 100644
--- a/src/includes.h
+++ b/src/includes.h
@@ -27,8 +27,8 @@
* @todo: if ZTS defined many errors appear. need debug.
* @todo this should come from some external source
*/
-// #define ZTS 1
-// #define PTHREADS 1
+//#define ZTS 1
+//#define PTHREADS 1
/**
* PHP includes
diff --git a/src/object.cpp b/src/object.cpp
index a0777fe..05449bc 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -37,7 +37,7 @@ Object::Object(const char *name, Base *base)
if (!entry) throw Php::Exception(std::string("Unknown class name ") + name);
// store the object in the php object cache (this will give the object a handle)
- base->store(entry);
+ base->store(entry TSRMLS_CC);
// now we can store it
operator=(Value(base));