fix broken merge, led to double define

This commit is contained in:
Andrey Hristov 2010-10-06 10:35:02 +00:00
parent 76d273d455
commit e38078bae9

View File

@ -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);