diff options
| author | Remi Collet <remi@php.net> | 2016-03-16 07:18:23 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2016-03-16 07:18:23 +0100 |
| commit | d45f478454c846adf15fa44d7c026e8b702694d2 (patch) | |
| tree | e55f962f06ae5b71aa40847cab15b767f8cc1e2f | |
| parent | 4165ae14204954bfe6497f1d724636da02bfdfd2 (diff) | |
| parent | 46293ed6d451f9a8a4653cd0179b3f501bb12b4a (diff) | |
| download | php-git-d45f478454c846adf15fa44d7c026e8b702694d2.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
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 |