archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0'

Browse source 
* PHP-7.0:
  fix #ifdef usage
This commit is contained in:
Remi Collet 2016-03-16 07:18:23 +01:00
commit d45f478454
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/pdo_dblib/dblib_stmt.c
View file

@ -277,7 +277,7 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,
dbdatecrack(H->link, &di, &dt); dbdatecrack(H->link, &di, &dt);
*len = spprintf((char**) &tmp_ptr, 20, "%d-%02d-%02d %02d:%02d:%02d", *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 di.year, di.month, di.day, di.hour, di.minute, di.second
#else #else
di.dateyear, di.datemonth+1, di.datedmonth, di.datehour, di.dateminute, di.datesecond di.dateyear, di.datemonth+1, di.datedmonth, di.datehour, di.dateminute, di.datesecond