summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-03 08:50:39 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-03 08:50:39 +0200
commita5aaa0877fa586499c4be8f19df760fff11f28dd (patch)
tree77d9849243364c85e2052f81ef7fe2539f068d74
parent9598dd5541c87efc654a0a05aec6bb895fabfeb1 (diff)
fixes to compile on 5.3
-rw-r--r--src/classimpl.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/classimpl.h b/src/classimpl.h
index 4da4eba..03cce2b 100644
--- a/src/classimpl.h
+++ b/src/classimpl.h
@@ -220,8 +220,11 @@ public:
* @param tsrm_ls
* @return zval
*/
+#if PHP_VERSION_ID >= 50400
static zval *readProperty(zval *object, zval *name, int type, const zend_literal *key TSRMLS_DC);
+#else
static zval *readProperty(zval *object, zval *name, int type TSRMLS_DC);
+#endif
/**
* Function that is called when a property is set / updated
@@ -232,8 +235,11 @@ public:
* @param tsrm_ls
* @return zval
*/
+#if PHP_VERSION_ID >= 50400
static void writeProperty(zval *object, zval *name, zval *value, const zend_literal *key TSRMLS_DC);
+#else
static void writeProperty(zval *object, zval *name, zval *value TSRMLS_DC);
+#endif
/**
* Function that is called to check whether a certain property is set
@@ -243,8 +249,11 @@ public:
* @param tsrm_ls
* @return bool
*/
+#if PHP_VERSION_ID >= 50400
static int hasProperty(zval *object, zval *name, int has_set_exists, const zend_literal *key TSRMLS_DC);
+#else
static int hasProperty(zval *object, zval *name, int has_set_exists TSRMLS_DC);
+#endif
/**
* Function that is called when a property is removed from the project
@@ -252,8 +261,11 @@ public:
* @param member The member to remove
* @param tsrm_ls
*/
+#if PHP_VERSION_ID >= 50400
static void unsetProperty(zval *object, zval *member, const zend_literal *key TSRMLS_DC);
+#else
static void unsetProperty(zval *object, zval *member TSRMLS_DC);
+#endif
/**
* Method that returns information about the function signature of a undefined method
@@ -264,8 +276,11 @@ public:
* @param tsrm_ls
* @return zend_function
*/
- static zend_function *getMethod(zval **object_ptr, char *method, int method_len TSRMLS_DC);
+#if PHP_VERSION_ID >= 50400
static zend_function *getMethod(zval **object_ptr, char *method, int method_len, const zend_literal *key TSRMLS_DC);
+#else
+ static zend_function *getMethod(zval **object_ptr, char *method, int method_len TSRMLS_DC);
+#endif
/**
* Method that returns information about the function signature of an undefined static method