Fix [-Wundef] warning in MySQLi extension

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 17452bf287688af8f9e626c4ce6373cacd8b710b..1c56c907ce2b714665e4a690381b200bc81697e5 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -662,7 +662,7 @@ PHP_MINIT_FUNCTION(mysqli)
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_READ_TIMEOUT", MYSQL_OPT_READ_TIMEOUT, CONST_CS | CONST_PERSISTENT);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE", MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE", MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
 #endif
@@ -686,7 +686,7 @@ PHP_MINIT_FUNCTION(mysqli)
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_FOUND_ROWS", CLIENT_FOUND_ROWS, CONST_CS | CONST_PERSISTENT);
 #ifdef CLIENT_SSL_VERIFY_SERVER_CERT
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT", CLIENT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT", CLIENT_SSL_DONT_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
 #endif
 #endif
@@ -875,7 +875,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
  */
 PHP_RINIT_FUNCTION(mysqli)
 {
-#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
+#ifndef MYSQLI_USE_MYSQLND && defined(ZTS)
        if (mysql_thread_init()) {
                return FAILURE;
        }
@@ -912,7 +912,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
 {
        /* check persistent connections, move used to free */
 
-#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
+#ifndef MYSQLI_USE_MYSQLND && defined(ZTS)
        mysql_thread_end();
 #endif
        if (MyG(error_msg)) {
@@ -942,7 +942,7 @@ PHP_MINFO_FUNCTION(mysqli)
        php_info_print_table_row(2, "Inactive Persistent Links", buf);
        snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_links));
        php_info_print_table_row(2, "Active Links", buf);
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION);
        php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
 #endif
@@ -956,7 +956,7 @@ PHP_MINFO_FUNCTION(mysqli)
 /* Dependencies */
 static const  zend_module_dep mysqli_deps[] = {
        ZEND_MOD_REQUIRED("spl")
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        ZEND_MOD_REQUIRED("mysqlnd")
 #endif
        ZEND_MOD_END
@@ -1091,7 +1091,7 @@ PHP_FUNCTION(mysqli_result_construct)
  */
 void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype)
 {
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        MYSQL_ROW row;
        unsigned int    i, num_fields;
        MYSQL_FIELD             *fields;

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index f391cd6234d49044e728c0e9165f4fb7d7bbfeaa..b364feec4b06543358767cd55117b102e16f67bf 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -32,7 +32,7 @@
 #include "ext/mysqlnd/mysql_float_to_double.h"
 
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
 /* {{{ mysqli_tx_cor_options_to_string */
 static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const uint32_t mode)
 {
@@ -609,7 +609,7 @@ PHP_FUNCTION(mysqli_change_user)
        char            *user, *password, *dbname;
        size_t                  user_len, password_len, dbname_len;
        zend_ulong              rc;
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        const           CHARSET_INFO * old_charset;
 #endif
 
@@ -618,11 +618,11 @@ PHP_FUNCTION(mysqli_change_user)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        old_charset = mysql->mysql->charset;
 #endif
 
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        rc = mysqlnd_change_user_ex(mysql->mysql, user, password, dbname, FALSE, (size_t) password_len);
 #else
        rc = mysql_change_user(mysql->mysql, user, password, dbname);
@@ -632,7 +632,7 @@ PHP_FUNCTION(mysqli_change_user)
        if (rc) {
                RETURN_FALSE;
        }
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysql_get_server_version(mysql->mysql) < 50123L) {
                /*
                  Request the current charset, or it will be reset to the system one.
@@ -681,12 +681,12 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
                if ((le = zend_hash_find_ptr(&EG(persistent_list), mysql->hash_key)) != NULL) {
                        if (le->type == php_le_pmysqli()) {
                                mysqli_plist_entry *plist = (mysqli_plist_entry *) le->ptr;
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
                                mysqlnd_end_psession(mysql->mysql);
 #endif
 
                                if (MyG(rollback_on_cached_plink) &&
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
                                        mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL))
 #else
                                        FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL))
@@ -745,7 +745,7 @@ PHP_FUNCTION(mysqli_commit)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysqli_commit_or_rollback_libmysql(mysql->mysql, TRUE, flags, name)) {
 #else
        if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
@@ -1125,7 +1125,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
    Fetch results from a prepared statement into the bound variables */
 PHP_FUNCTION(mysqli_stmt_fetch)
 {
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 #else
        mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -1252,7 +1252,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
        MYSQL_RES               *result;
        zval                    *mysql_result;
        unsigned int    i, num_fields;
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        const size_t    *ret;
 #else
        const zend_ulong *ret;
@@ -1405,7 +1405,7 @@ PHP_FUNCTION(mysqli_get_host_info)
                RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        RETURN_STRING((mysql->mysql->host_info) ? mysql->mysql->host_info : "");
 #else
        RETURN_STRING((mysql->mysql->data->host_info) ? mysql->mysql->data->host_info : "");
@@ -1500,7 +1500,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_method)
 
        mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (!(mysql->mysql = mysql_init(NULL)))
 #else
        /*
@@ -1768,7 +1768,7 @@ PHP_FUNCTION(mysqli_options)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
                if(mysql_option == MYSQL_OPT_LOCAL_INFILE) {
                        RETURN_FALSE;
@@ -1842,7 +1842,7 @@ PHP_FUNCTION(mysqli_prepare)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysql->mysql->status == MYSQL_STATUS_GET_RESULT) {
                php_error_docref(NULL, E_WARNING, "All data must be fetched before a new statement prepare takes place");
                RETURN_FALSE;
@@ -1854,7 +1854,7 @@ PHP_FUNCTION(mysqli_prepare)
        if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
                if (mysql_stmt_prepare(stmt->stmt, query, query_len)) {
                        /* mysql_stmt_close() clears errors, so we have to store them temporarily */
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
                        char  last_error[MYSQL_ERRMSG_SIZE];
                        char  sqlstate[SQLSTATE_LENGTH+1];
                        unsigned int last_errno;
@@ -1872,7 +1872,7 @@ PHP_FUNCTION(mysqli_prepare)
                        stmt->stmt = NULL;
 
                        /* restore error messages */
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
                        mysql->mysql->net.last_errno = last_errno;
                        memcpy(mysql->mysql->net.last_error, last_error, MYSQL_ERRMSG_SIZE);
                        memcpy(mysql->mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH+1);
@@ -1986,7 +1986,7 @@ PHP_FUNCTION(mysqli_rollback)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, flags, name)) {
 #else
        if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
@@ -2264,7 +2264,7 @@ PHP_FUNCTION(mysqli_stat)
 {
        MY_MYSQL        *mysql;
        zval            *mysql_link;
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        zend_string *stat;
 #else
        char            *stat;
@@ -2275,7 +2275,7 @@ PHP_FUNCTION(mysqli_stat)
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if ((stat = (char *)mysql_stat(mysql->mysql)))
        {
                RETURN_STRING(stat);
@@ -2347,7 +2347,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
                mode_p = &mode;
                break;
        }
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysql_stmt_attr_set(stmt->stmt, attr, mode_p)) {
 #else
        if (FAIL == mysql_stmt_attr_set(stmt->stmt, attr, mode_p)) {
@@ -2516,7 +2516,7 @@ PHP_FUNCTION(mysqli_stmt_store_result)
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        {
                /*
                  If the user wants to store the data and we have BLOBs/TEXTs we try to allocate
@@ -2588,7 +2588,7 @@ PHP_FUNCTION(mysqli_store_result)
                RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
-#if MYSQLI_USE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
        result = flags & MYSQLI_STORE_RESULT_COPY_DATA? mysqlnd_store_result_ofs(mysql->mysql) : mysqlnd_store_result(mysql->mysql);
 #else
        result = mysql_store_result(mysql->mysql);

diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index 72c571ba821ae866725781ec4e717a0c2234d0ef..6bcf5902df58f80a8ac6b308028a2e50f7eca47d 100644 (file)
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -120,7 +120,7 @@ MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode)
 
 ZEND_FUNCTION(mysqli_driver_construct)
 {
-#if G0
+#ifdef G0
        MYSQLI_RESOURCE         *mysqli_resource;
 
        mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index bc6cafb69b75b1702d0598b2cbe9172aa95289eb..5f3114e9df4a59c4320fde416c2e0f0f0c29d362 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -111,7 +111,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
                flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
                /* remove some insecure options */
                flags &= ~CLIENT_MULTI_STATEMENTS;   /* don't allow multi_queries via connect parameter */
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
                if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
                        flags &= ~CLIENT_LOCAL_FILES;
                }
@@ -242,7 +242,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
                goto err;
        }
        if (!mysql->mysql) {
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
                if (!(mysql->mysql = mysql_init(NULL))) {
 #else
                if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA, persistent))) {
@@ -252,7 +252,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
                new_connection = TRUE;
        }
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        /* BC for prior to bug fix #53425 */
        flags |= CLIENT_MULTI_RESULTS;
 
@@ -325,7 +325,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
        /* clear error */
        php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql));
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        mysql->mysql->reconnect = MyG(reconnect);
 #endif
        unsigned int allow_local_infile = MyG(allow_local_infile);
@@ -432,7 +432,7 @@ PHP_FUNCTION(mysqli_fetch_assoc)
 
 /* {{{ proto mixed mysqli_fetch_all(object result [,int resulttype])
    Fetches all result rows as an associative array, a numeric array, or both */
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
 PHP_FUNCTION(mysqli_fetch_all)
 {
        MYSQL_RES       *result;
@@ -494,7 +494,7 @@ PHP_FUNCTION(mysqli_error_list)
                RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        if (1) {
                MYSQLND_ERROR_LIST_ELEMENT * message;
                zend_llist_position pos;
@@ -540,7 +540,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
                RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        if (stmt->stmt && stmt->stmt->data && stmt->stmt->data->error_info) {
                MYSQLND_ERROR_LIST_ELEMENT * message;
                zend_llist_position pos;
@@ -722,7 +722,7 @@ PHP_FUNCTION(mysqli_query)
 }
 /* }}} */
 
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
 #include "php_network.h"
 /* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */
 static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array)
@@ -1064,7 +1064,7 @@ PHP_FUNCTION(mysqli_get_charset)
        zval                                    *mysql_link;
        const char                              *name = NULL, *collation = NULL, *dir = NULL, *comment = NULL;
        uint32_t                                minlength, maxlength, number, state;
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        MY_CHARSET_INFO                 cs;
 #else
        const MYSQLND_CHARSET   *cs;
@@ -1076,7 +1076,7 @@ PHP_FUNCTION(mysqli_get_charset)
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        mysql_get_character_set_info(mysql->mysql, &cs);
        name = (char *)cs.csname;
        collation = (char *)cs.name;
@@ -1113,7 +1113,7 @@ PHP_FUNCTION(mysqli_get_charset)
 }
 /* }}} */
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
 extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name);
 
 /* {{{ proto bool mysqli_begin_transaction_libmysql */
@@ -1192,7 +1192,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
                RETURN_FALSE;
        }
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysqli_begin_transaction_libmysql(mysql->mysql, flags, name)) {
                RETURN_FALSE;
        }
@@ -1205,7 +1205,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
 }
 /* }}} */
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
 /* {{{ proto bool mysqli_savepoint_libmysql */
 static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release)
 {
@@ -1237,7 +1237,7 @@ PHP_FUNCTION(mysqli_savepoint)
                RETURN_FALSE;
        }
 
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysqli_savepoint_libmysql(mysql->mysql, name, FALSE)) {
 #else
        if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {
@@ -1265,7 +1265,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
                php_error_docref(NULL, E_WARNING, "Savepoint name cannot be empty");
                RETURN_FALSE;
        }
-#if !defined(MYSQLI_USE_MYSQLND)
+#ifndef MYSQLI_USE_MYSQLND
        if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) {
 #else
        if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index ef564a35d5bcac10cca0ad94ff819f0c7446cbcc..2ee059c7563d304006e8646b68f5e779f01d76b5 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -192,7 +192,7 @@ static int link_error_list_read(mysqli_object *obj, zval *retval, zend_bool quie
 
        if (mysql) {
                array_init(retval);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
                if (1) {
                        MYSQLND_ERROR_LIST_ELEMENT * message;
                        zend_llist_position pos;
@@ -264,7 +264,7 @@ static int result_type_read(mysqli_object *obj, zval *retval, zend_bool quiet)
 static int result_lengths_read(mysqli_object *obj, zval *retval, zend_bool quiet)
 {
        MYSQL_RES *p;
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        const size_t *ret;
 #else
        const zend_ulong *ret;
@@ -356,7 +356,7 @@ static int stmt_error_list_read(mysqli_object *obj, zval *retval, zend_bool quie
        stmt = (MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
        if (stmt && stmt->stmt) {
                array_init(retval);
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
                if (stmt->stmt->data && stmt->stmt->data->error_info) {
                        MYSQLND_ERROR_LIST_ELEMENT * message;
                        zend_llist_position pos;

diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c
index 3721edf5e3daa2679bcc0e10cf0c70be0d5241d7..df36a840e41fba24aa1a5daa3e25134080f2377b 100644 (file)
--- a/ext/mysqli/mysqli_result_iterator.c
+++ b/ext/mysqli/mysqli_result_iterator.c
@@ -117,7 +117,7 @@ static void php_mysqli_result_iterator_rewind(zend_object_iterator *iter)
        MYSQLI_FETCH_RESOURCE_BY_OBJ(result, MYSQL_RES *, intern, "mysqli_result", MYSQLI_STATUS_VALID);
 
        if (mysqli_result_is_unbuffered(result)) {
-#if MYSQLI_USE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
                if (result->unbuf->eof_reached) {
 #else
                if (result->eof) {

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 0edf0871d6436d30e33a59251f9ed2a2e7915b26..43c9b64fa8a3f15dfb8757cc0f1c592accb31373 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -99,7 +99,7 @@ typedef struct {
        php_stream              *li_stream;
        unsigned int    multi_query;
        zend_bool               persistent;
-#if defined(MYSQLI_USE_MYSQLND)
+#ifdef MYSQLI_USE_MYSQLND
        int                             async_result_fetch_type;
 #endif
 } MY_MYSQL;