com php-src: fix incompatible pointer types: Zend/zend_execut e_API.c

From: Date: Mon, 17 Nov 2014 08:33:37 +0000
Subject: com php-src: fix incompatible pointer types: Zend/zend_execut e_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83118@lists.php.net to get a copy of this message
Commit: 1504e9c9df0b504d08d46ef249eef75c39576055 Author: Anatol Belski <ab@php.net> Mon, 17 Nov 2014 08:48:32 +0100 Parents: 6d9b4ca5fc806f77f75cd88f34fb1952a4731f9b Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1504e9c9df0b504d08d46ef249eef75c39576055 Log: fix incompatible pointer types Changed paths: M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9d4eebf..f5ee014 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1341,6 +1341,10 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */ #ifdef ZEND_WIN32 static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* {{{ */ { +#ifdef ZTS + THREAD_T thread_id = (THREAD_T)wParam; +#endif + switch (message) { case WM_DESTROY: PostQuitMessage(0); @@ -1355,7 +1359,7 @@ static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wPa #endif SetTimer(timeout_window, wParam, lParam*1000, NULL); #ifdef ZTS - tsrm_ls = ts_resource_ex(0, &wParam); + tsrm_ls = ts_resource_ex(0, &thread_id); if (!tsrm_ls) { /* shouldn't normally happen */ break; @@ -1372,7 +1376,7 @@ static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wPa #ifdef ZTS void ***tsrm_ls; - tsrm_ls = ts_resource_ex(0, &wParam); + tsrm_ls = ts_resource_ex(0, &thread_id); if (!tsrm_ls) { /* Thread died before receiving its timeout? */ break;

« previous php.cvs (#83118) next »