diff options
| author | Andrey Hristov <andrey@php.net> | 2008-03-10 20:15:38 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-03-10 20:15:38 +0000 |
| commit | 725b31fc6cce293405d8c7875f2fdc657f9daccc (patch) | |
| tree | 639cfa727c33909c1aad49786ed31609808833a9 /ext/mysqli/php_mysqli_structs.h | |
| parent | 49add03404141a0af3683471f2aa967818ba350e (diff) | |
| download | php-git-725b31fc6cce293405d8c7875f2fdc657f9daccc.tar.gz | |
Update mysqlnd, ext/mysql and ext/mysqli - now possible to compile with different
configurations one or the another extension to use libmysql or mysqlnd mixed in
one binary
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 05c87be574..2dfdfc0e13 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -36,7 +36,7 @@ #define FALSE 0 #endif -#ifdef HAVE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND #include "ext/mysqlnd/mysqlnd.h" #include "mysqli_mysqlnd.h" #else @@ -127,7 +127,7 @@ typedef struct _mysqli_property_entry { int (*w_func)(mysqli_object *obj, zval *value TSRMLS_DC); } mysqli_property_entry; -#if !defined(HAVE_MYSQLND) +#if !defined(MYSQLI_USE_MYSQLND) typedef struct { char error_msg[LOCAL_INFILE_ERROR_LEN]; void *userdata; @@ -176,7 +176,7 @@ extern const mysqli_property_entry mysqli_stmt_property_entries[]; extern const mysqli_property_entry mysqli_driver_property_entries[]; extern const mysqli_property_entry mysqli_warning_property_entries[]; -#ifdef HAVE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND extern MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache; extern MYSQLND_QCACHE *mysqli_mysqlnd_qcache; #endif @@ -302,7 +302,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML #define MYSQLI_STORE_RESULT 0 #define MYSQLI_USE_RESULT 1 -#ifdef HAVE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND #define MYSQLI_BG_STORE_RESULT 101 #endif @@ -370,7 +370,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli) HashTable *report_ht; unsigned long multi_query; unsigned long embedded; -#ifdef HAVE_MYSQLND +#ifdef MYSQLI_USE_MYSQLND MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; #endif ZEND_END_MODULE_GLOBALS(mysqli) |