diff options
| author | Remi Collet <remi@php.net> | 2016-03-16 07:18:09 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2016-03-16 07:18:09 +0100 |
| commit | 46293ed6d451f9a8a4653cd0179b3f501bb12b4a (patch) | |
| tree | cc2f761f7a9f4ee33f92297e84f63b18c7026d31 | |
| parent | ba71144b8c252fda301140f378716c528f3986f4 (diff) | |
| parent | 478c80712877da23019802178da1fcd6e6b83e1e (diff) | |
| download | php-git-46293ed6d451f9a8a4653cd0179b3f501bb12b4a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* 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 |