From ffe82dd775c2fc4b76e2339f893d2fd1d27bf916 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Mar 2016 07:18:09 +0100 Subject: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: fix #ifdef usage --- ext/pdo_dblib/dblib_stmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index 0eff4945dd..8d7762ad8d 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -277,7 +277,7 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, dbdatecrack(H->link, &di, &dt); *len = spprintf((char**) &tmp_ptr, 20, "%d-%02d-%02d %02d:%02d:%02d", -#ifdef PHP_DBLIB_IS_MSSQL || MSDBLIB +#if defined(PHP_DBLIB_IS_MSSQL) || defined(MSDBLIB) di.year, di.month, di.day, di.hour, di.minute, di.second #else di.dateyear, di.datemonth+1, di.datedmonth, di.datehour, di.dateminute, di.datesecond -- cgit v1.2.1