blob: b3f159823d7777dfb9b2b58d0faa6d61121cb7aa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 1cee84967f929c37a4031ad8f17422ba63d0ef6e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 3 Dec 2013 07:08:48 +0100
Subject: [PATCH] fix NTS build
---
sdl/php_sdl_time.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sdl/php_sdl_time.c b/sdl/php_sdl_time.c
index 882897d..ad51d09 100644
--- a/sdl/php_sdl_time.c
+++ b/sdl/php_sdl_time.c
@@ -29,7 +29,9 @@ int le_timer;
typedef struct php_sdl_timer {
SDL_TimerID id;
- long caller_thread_id;
+#ifdef ZTS
+ THREAD_T caller_thread_id;
+#endif
zend_fcall_info *cb_fci;
} php_sdl_timer_t;
@@ -72,7 +74,9 @@ PHP_FUNCTION(sdl_delay)
Uint32 php_sdl_timer_callback(Uint32 interval, void *param)
{
php_sdl_timer_t *timer_data = (php_sdl_timer_t*)param;
+#ifdef ZTS
void ***tsrm_ls = (void ***) ts_resource_ex(0, &(timer_data->caller_thread_id));
+#endif
zval *cb_retval = NULL;
timer_data->cb_fci->retval_ptr_ptr = &cb_retval;
@@ -125,10 +129,8 @@ PHP_FUNCTION(sdl_addtimer)
}
// We need the callers thread id for the callback to occur in the right thread
-#ifdef ZTS
- timer_data->caller_thread_id = (long)tsrm_thread_id();
-#else
- timer_data->caller_thread_id = (long)getpid();
+#ifdef ZTS
+ timer_data->caller_thread_id = tsrm_thread_id();
#endif
timer_data->id = SDL_AddTimer((Uint32)interval, php_sdl_timer_callback, (void*)timer_data);
--
1.8.3.1
|
