pajoye Tue, 01 Feb 2011 13:57:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307914
Log:
- fix build, wrong version id
Changed paths:
U php/php-src/trunk/ext/snmp/snmp.c
Modified: php/php-src/trunk/ext/snmp/snmp.c
===================================================================
--- php/php-src/trunk/ext/snmp/snmp.c 2011-02-01 12:16:32 UTC (rev 307913)
+++ php/php-src/trunk/ext/snmp/snmp.c 2011-02-01 13:57:06 UTC (rev 307914)
@@ -506,7 +506,7 @@
static zend_object_value php_snmp_object_new(zend_class_entry *class_type
TSRMLS_DC) /* {{{ */
{
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
zval *tmp;
#endif
zend_object_value retval;
@@ -517,7 +517,7 @@
memset(&intern->zo, 0, sizeof(php_snmp_object));
zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
zend_hash_copy(intern->zo.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref,(void *) &tmp, sizeof(zval *));
#else
object_properties_init(&intern->zo, class_type);
@@ -1804,7 +1804,7 @@
/* {{{ php_snmp_read_property(zval *object, zval *member, int type[, const
zend_literal *key])
Generic object property reader */
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
zval *php_snmp_read_property(zval *object, zval *member, int type TSRMLS_DC)
#else
zval *php_snmp_read_property(zval *object, zval *member, int type, const
zend_literal *key TSRMLS_DC)
@@ -1838,7 +1838,7 @@
}
} else {
zend_object_handlers * std_hnd = zend_get_std_object_handlers();
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
retval = std_hnd->read_property(object, member, type TSRMLS_CC);
#else
retval = std_hnd->read_property(object, member, type, key
TSRMLS_CC);
@@ -1854,7 +1854,7 @@
/* {{{ php_snmp_write_property(zval *object, zval *member, zval *value[, const
zend_literal *key])
Generic object property writer */
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
void php_snmp_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
#else
void php_snmp_write_property(zval *object, zval *member, zval *value, const
zend_literal *key TSRMLS_DC)
@@ -1885,7 +1885,7 @@
}
} else {
zend_object_handlers * std_hnd = zend_get_std_object_handlers();
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
std_hnd->write_property(object, member, value TSRMLS_CC);
#else
std_hnd->write_property(object, member, value, key TSRMLS_CC);
@@ -1900,7 +1900,7 @@
/* {{{ php_snmp_has_property(zval *object, zval *member, int has_set_exists[,
const zend_literal *key])
Generic object property checker */
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
static int php_snmp_has_property(zval *object, zval *member, int
has_set_exists TSRMLS_DC)
#else
static int php_snmp_has_property(zval *object, zval *member, int
has_set_exists, const zend_literal *key TSRMLS_DC)
@@ -1916,7 +1916,7 @@
ret = 1;
break;
case 0: {
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
zval *value = php_snmp_read_property(object,
member, BP_VAR_IS TSRMLS_CC);
#else
zval *value = php_snmp_read_property(object,
member, BP_VAR_IS, key TSRMLS_CC);
@@ -1930,7 +1930,7 @@
break;
}
default: {
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
zval *value = php_snmp_read_property(object,
member, BP_VAR_IS TSRMLS_CC);
#else
zval *value = php_snmp_read_property(object,
member, BP_VAR_IS, key TSRMLS_CC);
@@ -1947,7 +1947,7 @@
}
} else {
zend_object_handlers * std_hnd = zend_get_std_object_handlers();
-#if PHP_VERSION_ID < 503099
+#if PHP_VERSION_ID < 50399
ret = std_hnd->has_property(object, member, has_set_exists
TSRMLS_CC);
#else
ret = std_hnd->has_property(object, member, has_set_exists, key
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
