php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
This commit is contained in:
Anatol Belski
2013-12-24 21:09:45 +01:00
parent c02acf3c29 00c7b973bb
commit 3af0ee0ea3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sapi/phpdbg/phpdbg_utils.c
View File

@@ -290,8 +290,9 @@ PHPDBG_API int phpdbg_rlog(FILE *fp, const char *fmt, ...) { /* {{{ */
if (gettimeofday(&tp, NULL) == SUCCESS) {
char friendly[100];
char *format = NULL, *buffer = NULL;
const time_t tt = tp.tv_sec;
strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tp.tv_sec));
strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tt));
asprintf(
&buffer, friendly, tp.tv_usec/1000);
asprintf(