From: Andrey Hristov Date: Wed, 6 Oct 2010 10:35:02 +0000 (+0000) Subject: fix broken merge, led to double define X-Git-Tag: php-5.4.0alpha1~191^2~813 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e38078bae90a27d40cf1e5b91c52d0620d2c8905;p=php fix broken merge, led to double define --- diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h index 7b8a41ce7d..d042694146 100644 --- a/ext/mysqli/mysqli_priv.h +++ b/ext/mysqli/mysqli_priv.h @@ -78,13 +78,6 @@ extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC 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);