Skip to content

Commit c932cc8

Browse files
GirgiasGirgias
committed
Fix [-Wundef] warning in PDO MySQL extension
1 parent db7dc2f commit c932cc8

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎ext/pdo_mysql/mysql_driver.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#endif
3333
#include "zend_exceptions.h"
3434

35-
#if defined(PDO_USE_MYSQLND)
35+
#ifdef PDO_USE_MYSQLND
3636
# define pdo_mysql_init(persistent) mysqlnd_init(MYSQLND_CLIENT_NO_FLAG, persistent)
3737
#else
3838
# define pdo_mysql_init(persistent) mysql_init(NULL)
@@ -224,7 +224,7 @@ static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, size_t sql_len
224224

225225
if (S->num_params) {
226226
S->params_given = 0;
227-
#if defined(PDO_USE_MYSQLND)
227+
#ifdef PDO_USE_MYSQLND
228228
S->params = NULL;
229229
#else
230230
S->params = ecalloc(S->num_params, sizeof(MYSQL_BIND));
@@ -444,7 +444,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
444444
ZVAL_STRING(return_value, (char *)mysql_get_host_info(H->server));
445445
break;
446446
case PDO_ATTR_SERVER_INFO: {
447-
#if defined(PDO_USE_MYSQLND)
447+
#ifdef PDO_USE_MYSQLND
448448
zend_string *tmp;
449449

450450
if (mysqlnd_stat(H->server, &tmp) == PASS) {
@@ -577,7 +577,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
577577
|CLIENT_MULTI_RESULTS
578578
#endif
579579
;
580-
#if defined(PDO_USE_MYSQLND)
580+
#ifdef PDO_USE_MYSQLND
581581
size_t dbname_len = 0;
582582
size_t password_len = 0;
583583
#endif
@@ -610,7 +610,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
610610
pdo_mysql_error(dbh);
611611
goto cleanup;
612612
}
613-
#if defined(PDO_USE_MYSQLND)
613+
#ifdef PDO_USE_MYSQLND
614614
if (dbh->is_persistent) {
615615
mysqlnd_restart_psession(H->server);
616616
}

‎ext/pdo_mysql/mysql_statement.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static int pdo_mysql_stmt_dtor(pdo_stmt_t *stmt) /* {{{ */
100100
}
101101
}
102102

103-
#if PDO_USE_MYSQLND
103+
#ifdef PDO_USE_MYSQLND
104104
if (!S->stmt && S->current_data) {
105105
mnd_free(S->current_data);
106106
}
@@ -339,13 +339,13 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
339339
{
340340
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
341341
pdo_mysql_db_handle *H = S->H;
342-
#if PDO_USE_MYSQLND
342+
#ifdef PDO_USE_MYSQLND
343343
zend_long row_count;
344344
#endif
345345
PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset");
346346
PDO_DBG_INF_FMT("stmt=%p", S->stmt);
347347

348-
#if PDO_USE_MYSQLND
348+
#ifdef PDO_USE_MYSQLND
349349
if (!H->emulate_prepare) {
350350
if (!mysqlnd_stmt_more_results(S->stmt)) {
351351
PDO_DBG_RETURN(0);
@@ -416,7 +416,7 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
416416
/* No more results */
417417
PDO_DBG_RETURN(0);
418418
}
419-
#if PDO_USE_MYSQLND
419+
#ifdef PDO_USE_MYSQLND
420420
if (mysql_next_result(H->server) == FAIL) {
421421
pdo_mysql_error_stmt(stmt);
422422
PDO_DBG_RETURN(0);
@@ -491,7 +491,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
491491
parameter = Z_REFVAL(param->parameter);
492492
}
493493

494-
#if PDO_USE_MYSQLND
494+
#ifdef PDO_USE_MYSQLND
495495
if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_NULL || (Z_TYPE_P(parameter) == IS_NULL)) {
496496
mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_NULL);
497497
PDO_DBG_RETURN(1);
@@ -537,7 +537,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
537537
;
538538
}
539539

540-
#if PDO_USE_MYSQLND
540+
#ifdef PDO_USE_MYSQLND
541541
/* Is it really correct to check the zval's type? - But well, that's what the old code below does, too */
542542
PDO_DBG_INF_FMT("param->parameter->type=%d", Z_TYPE(param->parameter));
543543
if (!Z_ISREF(param->parameter)) {
@@ -614,7 +614,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
614614
static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, zend_long offset) /* {{{ */
615615
{
616616
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
617-
#if PDO_USE_MYSQLND
617+
#ifdef PDO_USE_MYSQLND
618618
zend_bool fetched_anything;
619619

620620
PDO_DBG_ENTER("pdo_mysql_stmt_fetch");
@@ -653,14 +653,14 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
653653
strcpy(stmt->error_code, "HY000");
654654
PDO_DBG_RETURN(0);
655655
}
656-
#if PDO_USE_MYSQLND
656+
#ifdef PDO_USE_MYSQLND
657657
if (!S->stmt && S->current_data) {
658658
mnd_free(S->current_data);
659659
}
660660
#endif /* PDO_USE_MYSQLND */
661661

662662
if ((S->current_data = mysql_fetch_row(S->result)) == NULL) {
663-
#if PDO_USE_MYSQLND
663+
#ifdef PDO_USE_MYSQLND
664664
if (S->result->unbuf && !S->result->unbuf->eof_reached && mysql_errno(S->H->server)) {
665665
#else
666666
if (!S->result->eof && mysql_errno(S->H->server)) {
@@ -743,7 +743,7 @@ static int pdo_mysql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_
743743
/* error invalid column */
744744
PDO_DBG_RETURN(0);
745745
}
746-
#if PDO_USE_MYSQLND
746+
#ifdef PDO_USE_MYSQLND
747747
if (S->stmt) {
748748
Z_TRY_ADDREF(S->stmt->data->result_bind[colno].zv);
749749
*ptr = (char*)&S->stmt->data->result_bind[colno].zv;

‎ext/pdo_mysql/pdo_mysql.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
4848
# ifdef PHP_MYSQL_UNIX_SOCK_ADDR
4949
# define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
5050
# else
51-
# if !PHP_WIN32
51+
# ifndef PHP_WIN32
5252
# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock"
5353
# else
5454
# define PDO_MYSQL_UNIX_ADDR NULL
@@ -143,7 +143,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
143143
static PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
144144
{
145145
php_pdo_unregister_driver(&pdo_mysql_driver);
146-
#if PDO_USE_MYSQLND
146+
#ifdef PDO_USE_MYSQLND
147147
UNREGISTER_INI_ENTRIES();
148148
#endif
149149

@@ -169,7 +169,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql)
169169
/* }}} */
170170

171171

172-
#if PDO_USE_MYSQLND && PDO_DBG_ENABLED
172+
#if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED
173173
/* {{{ PHP_RINIT_FUNCTION
174174
*/
175175
static PHP_RINIT_FUNCTION(pdo_mysql)
@@ -245,7 +245,7 @@ zend_module_entry pdo_mysql_module_entry = {
245245
pdo_mysql_functions,
246246
PHP_MINIT(pdo_mysql),
247247
PHP_MSHUTDOWN(pdo_mysql),
248-
#if PDO_USE_MYSQLND && PDO_DBG_ENABLED
248+
#if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED
249249
PHP_RINIT(pdo_mysql),
250250
PHP_RSHUTDOWN(pdo_mysql),
251251
#else

‎ext/pdo_mysql/php_pdo_mysql_int.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef PHP_PDO_MYSQL_INT_H
2020
#define PHP_PDO_MYSQL_INT_H
2121

22-
#if defined(PDO_USE_MYSQLND)
22+
#ifdef PDO_USE_MYSQLND
2323
# include "ext/mysqlnd/mysqlnd.h"
2424
# include "ext/mysqlnd/mysqlnd_libmysql_compat.h"
2525
# define PDO_MYSQL_PARAM_BIND MYSQLND_PARAM_BIND
@@ -57,7 +57,7 @@ static inline void PDO_DBG_ENTER(char *func_name) {}
5757

5858
#endif
5959

60-
#if defined(PDO_USE_MYSQLND)
60+
#ifdef PDO_USE_MYSQLND
6161
#include "ext/mysqlnd/mysqlnd_debug.h"
6262
#endif
6363

@@ -101,7 +101,7 @@ typedef struct {
101101
unsigned buffered:1;
102102
unsigned emulate_prepare:1;
103103
unsigned fetch_table_names:1;
104-
#if !PDO_USE_MYSQLND
104+
#ifndef PDO_USE_MYSQLND
105105
zend_ulong max_buffer_size;
106106
#endif
107107

@@ -117,13 +117,13 @@ typedef struct {
117117
MYSQL_RES *result;
118118
const MYSQL_FIELD *fields;
119119
MYSQL_ROW current_data;
120-
#if PDO_USE_MYSQLND
120+
#ifdef PDO_USE_MYSQLND
121121
const size_t *current_lengths;
122122
#else
123123
zend_long *current_lengths;
124124
#endif
125125
pdo_mysql_error_info einfo;
126-
#if PDO_USE_MYSQLND
126+
#ifdef PDO_USE_MYSQLND
127127
MYSQLND_STMT *stmt;
128128
#else
129129
MYSQL_STMT *stmt;

0 commit comments

Comments
 (0)