Skip to content

Commit

Permalink
Merge branch 'master' of github.com:php-memcached-dev/php-memcached
Browse files Browse the repository at this point in the history
  • Loading branch information
iliaal committed Sep 28, 2011
2 parents c4b2542 + 473c63e commit c118423
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion php_memcached.c
Expand Up @@ -2457,7 +2457,7 @@ zend_object_value php_memc_new(zend_class_entry *ce TSRMLS_DC)

i_obj = ecalloc(1, sizeof(*i_obj));
zend_object_std_init( &i_obj->zo, ce TSRMLS_CC );
#ifdef ZEND_ENGINE_2_4
#if PHP_VERSION_ID >= 50400
object_properties_init( (zend_object *) i_obj, ce);
#else
zend_hash_copy(i_obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
Expand Down

0 comments on commit c118423

Please sign in to comment.