Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix #ifdef usage

diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index 0eff4945ddf72a2c7921c43ba45cc33b3fb0b7a9..8d7762ad8d62a9593ce0ddf347a6f7d0c474db51 100644 (file)
--- 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