diff options
| author | Anatol Belski <ab@php.net> | 2014-11-17 08:48:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-17 09:33:37 +0100 |
| commit | 1504e9c9df0b504d08d46ef249eef75c39576055 (patch) | |
| tree | a4da24a0225864a9e6b12386c68080fbb15e59a8 | |
| parent | 6d9b4ca5fc806f77f75cd88f34fb1952a4731f9b (diff) | |
| download | php-git-1504e9c9df0b504d08d46ef249eef75c39576055.tar.gz | |
fix incompatible pointer types
| -rw-r--r-- | Zend/zend_execute_API.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9d4eebf010..f5ee01463a 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; |