com php-src: fix incompatible pointer types: Zend/zend_execut e_API.c
| From: | Anatol Belski | Date: | Mon, 17 Nov 2014 08:34:20 +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-83117@lists.php.net to get a copy of this message | ||
Commit: 317d7c62eec25c06b9a2620b8ba455cd2fa4739d
Author: Anatol Belski <ab@php.net> Mon, 17 Nov 2014 08:47:48 +0100
Parents: 2c816d0c9b5fd124a81ed9ca606fd990e05724bc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=317d7c62eec25c06b9a2620b8ba455cd2fa4739d
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 eaa8410..5b31f46 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1166,6 +1166,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);
@@ -1180,7 +1184,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;
@@ -1197,7 +1201,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;