diff options
Diffstat (limited to 'sdl-nts.patch')
| -rw-r--r-- | sdl-nts.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/sdl-nts.patch b/sdl-nts.patch deleted file mode 100644 index b3f1598..0000000 --- a/sdl-nts.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 - |