andrey Wed, 06 Oct 2010 10:35:02 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=304140
Log: fix broken merge, led to double define Changed paths: U php/php-src/trunk/ext/mysqli/mysqli_priv.h Modified: php/php-src/trunk/ext/mysqli/mysqli_priv.h =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_priv.h 2010-10-06 10:33:44 UTC (rev 304139) +++ php/php-src/trunk/ext/mysqli/mysqli_priv.h 2010-10-06 10:35:02 UTC (rev 304140) @@ -78,13 +78,6 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException; #endif -#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \ - zend_class_entry tmp_ce; \ - INIT_CLASS_ENTRY(tmp_ce, name,class_functions); \ - tmp_ce.create_object = mysqli_objects_new; \ - mysqli_entry = zend_register_internal_class(&tmp_ce TSRMLS_CC); \ -} \ - #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRMLS_DC);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php