diff options
| author | Andrey Hristov <andrey@php.net> | 2010-10-06 10:35:02 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-10-06 10:35:02 +0000 |
| commit | e38078bae90a27d40cf1e5b91c52d0620d2c8905 (patch) | |
| tree | 91d5974d25d2d11f84268bc2c7a6c575f3c84f0f | |
| parent | 76d273d45533de547e733794e940cad8f673351f (diff) | |
| download | php-git-e38078bae90a27d40cf1e5b91c52d0620d2c8905.tar.gz | |
fix broken merge, led to double define
| -rw-r--r-- | ext/mysqli/mysqli_priv.h | 7 |
1 files changed, 0 insertions, 7 deletions
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); |