grknight    15/02/17 01:07:11

  Added:                pecl-drizzle-0.4.2-php54.patch
  Log:
  Revbump with 5.4+ support.  Lightly tested and may be removed if it breaks 
since dev-db/drizzle needs help
  
  (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 
0xD1F781EFF9F4A3B6)

Revision  Changes    Path
1.1                  dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch?rev=1.1&content-type=text/plain

Index: pecl-drizzle-0.4.2-php54.patch
===================================================================
diff -aurN drizzle-0.4.2.orig/php_drizzle.c drizzle-0.4.2/php_drizzle.c
--- drizzle-0.4.2.orig/php_drizzle.c    1970-01-01 04:13:08.000000000 -0500
+++ drizzle-0.4.2/php_drizzle.c 2014-10-22 21:38:21.882838493 -0400
@@ -1314,9 +1314,13 @@
        }
 
        zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
        zend_hash_copy(obj->std.properties, &(class_type->default_properties),
                      (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
                       sizeof(zval *));
+#else
+       object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
 
        value.handle= zend_objects_store_put(obj,
                           
(zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -1582,9 +1586,13 @@
        }
 
        zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
        zend_hash_copy(obj->std.properties, &(class_type->default_properties),
                       (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
                       sizeof(zval *));
+#else
+       object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
 
        obj->value.handle= zend_objects_store_put(obj,
                          
(zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -2505,9 +2513,13 @@
        }
 
        zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
        zend_hash_copy(obj->std.properties, &(class_type->default_properties),
                       (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
                       sizeof(zval *));
+#else
+       object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
 
        obj->value.handle= zend_objects_store_put(obj,
                       (zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -3017,9 +3029,13 @@
        }
 
        zend_object_std_init(&(result->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
        zend_hash_copy(result->std.properties, 
&(class_type->default_properties),
                       (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
                       sizeof(zval *));
+#else
+       object_properties_init((zend_object*) &(result->std), class_type);
+#endif
 
        value.handle= zend_objects_store_put(result,
                      (zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -3382,9 +3398,13 @@
        }
 
        zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
        zend_hash_copy(obj->std.properties, &(class_type->default_properties),
                       (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
                       sizeof(zval *));
+#else
+       object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
 
        value.handle= zend_objects_store_put(obj,
                     (zend_objects_store_dtor_t)zend_objects_destroy_object,




Reply via email to