diff options
| author | Remi Collet <remi@php.net> | 2016-03-16 07:18:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-16 08:11:50 +0100 |
| commit | ffe82dd775c2fc4b76e2339f893d2fd1d27bf916 (patch) | |
| tree | fbd3381eb3a40bb407ff569927c5c94ca51bff45 | |
| parent | 89919b5ec502594f7b085f8f45bb839223b6baa6 (diff) | |
| download | php-git-ffe82dd775c2fc4b76e2339f893d2fd1d27bf916.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0php-7.0.5RC1
* PHP-5.6:
fix #ifdef usage
| -rw-r--r-- | ext/pdo_dblib/dblib_stmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |