archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix [-Wundef] warning in PDO MySQL extension

Browse source
This commit is contained in:
George Peter Banyard 2020-05-20 15:41:13 +02:00
parent db7dc2fa2f
commit c932cc841a
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/pdo_mysql/php_pdo_mysql_int.h
View file

@ -19,7 +19,7 @@
#ifndef PHP_PDO_MYSQL_INT_H
#define PHP_PDO_MYSQL_INT_H
#if defined(PDO_USE_MYSQLND)
#ifdef PDO_USE_MYSQLND
# include "ext/mysqlnd/mysqlnd.h"
# include "ext/mysqlnd/mysqlnd_libmysql_compat.h"
# define PDO_MYSQL_PARAM_BIND MYSQLND_PARAM_BIND
@ -57,7 +57,7 @@ static inline void PDO_DBG_ENTER(char *func_name) {}
#endif
#if defined(PDO_USE_MYSQLND)
#ifdef PDO_USE_MYSQLND
#include "ext/mysqlnd/mysqlnd_debug.h"
#endif
@ -101,7 +101,7 @@ typedef struct {
unsigned buffered:1;
unsigned emulate_prepare:1;
unsigned fetch_table_names:1;
#if !PDO_USE_MYSQLND
#ifndef PDO_USE_MYSQLND
zend_ulong max_buffer_size;
#endif
@ -117,13 +117,13 @@ typedef struct {
MYSQL_RES *result;
const MYSQL_FIELD *fields;
MYSQL_ROW current_data;
#if PDO_USE_MYSQLND
#ifdef PDO_USE_MYSQLND
const size_t *current_lengths;
#else
zend_long *current_lengths;
#endif
pdo_mysql_error_info einfo;
#if PDO_USE_MYSQLND
#ifdef PDO_USE_MYSQLND
MYSQLND_STMT *stmt;
#else
MYSQL_STMT *stmt;