fix build errors

Author: smx-smx

TSRM/TSRM.c

@@ -11,8 +11,6 @@
 */
 
 #include "TSRM.h"
-#include <bits/pthreadtypes.h>
-#include <pthread.h>
 
 
 #ifdef TSRM_DEBUG

TSRM/TSRM.h

@@ -13,14 +13,6 @@
 #ifndef TSRM_H
 #define TSRM_H
 
-#ifdef TSRM_WIN32
-# ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS
-#  define WIN32_LEAN_AND_MEAN
-# endif
-#else
-# include <pthread.h>
-#endif
-
 #if !defined(__CYGWIN__) && defined(WIN32)
 # define TSRM_WIN32
 # include "Zend/zend_config.w32.h"
@@ -31,6 +23,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef TSRM_WIN32
+# ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS
+#  define WIN32_LEAN_AND_MEAN
+# endif
+#else
+# include <pthread.h>
+#endif
+
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
 #		define TSRM_API __declspec(dllexport)
@@ -50,6 +50,7 @@ typedef uintptr_t tsrm_uintptr_t;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+# define COND_T PCONDITION_VARIABLE
 #else
 # define THREAD_T pthread_t
 # define MUTEX_T pthread_mutex_t *

ext/ffi/ffi.c

@@ -30,6 +30,7 @@
 #include "main/SAPI.h"
 #include "TSRM.h"
 #include "zend_fibers.h"
+#include "zend_call_stack.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -932,9 +933,10 @@ static void zend_ffi_callback_hash_dtor(zval *zv) /* {{{ */
 	if (callback_data->fcc.function_handler->common.fn_flags & ZEND_ACC_CLOSURE) {
 		OBJ_RELEASE(ZEND_CLOSURE_OBJECT(callback_data->fcc.function_handler));
 	}
+	ffi_type **arg_types = callback_data->arg_types;
 	for (int i = 0; i < callback_data->arg_count; ++i) {
-		if (callback_data->arg_types[i]->type == FFI_TYPE_STRUCT) {
-			efree(callback_data->arg_types[i]);
+		if (arg_types[i]->type == FFI_TYPE_STRUCT) {
+			efree(arg_types[i]);
 		}
 	}
 	if (callback_data->ret_type->type == FFI_TYPE_STRUCT) {
@@ -1076,7 +1078,7 @@ static void zend_ffi_callback_trampoline(ffi_cif* cif, void* ret, void** args, v
 
 		if (zend_atomic_bool_load_ex(&FFI_G(callback_in_progress))) {
 			// call PHP function
-			zend_fiber_transfer transfer = zend_fiber_resume(&call_data.data->fiber, NULL, false);
+			zend_fiber_resume(&call_data.data->fiber, NULL, false);
 			zend_ffi_type *ret_type = ZEND_FFI_TYPE(call_data.data->type->func.ret_type);
 			if(ret_type->kind != ZEND_FFI_TYPE_VOID){
 				// extract return value from fiber
@@ -1139,15 +1141,16 @@ static void *zend_ffi_create_callback(zend_ffi_type *type, zval *value) /* {{{ *
 	if (type->func.args) {
 		int n = 0;
 		zend_ffi_type *arg_type;
+		ffi_type **arg_types = callback_data->arg_types;
 
 		ZEND_HASH_PACKED_FOREACH_PTR(type->func.args, arg_type) {
 			arg_type = ZEND_FFI_TYPE(arg_type);
-			callback_data->arg_types[n] = zend_ffi_get_type(arg_type);
-			if (!callback_data->arg_types[n]) {
+			arg_types[n] = zend_ffi_get_type(arg_type);
+			if (!arg_types[n]) {
 				zend_ffi_pass_unsupported(arg_type);
 				for (int i = 0; i < n; ++i) {
-					if (callback_data->arg_types[i]->type == FFI_TYPE_STRUCT) {
-						efree(callback_data->arg_types[i]);
+					if (arg_types[i]->type == FFI_TYPE_STRUCT) {
+						efree(arg_types[i]);
 					}
 				}
 				efree(callback_data);
@@ -1178,9 +1181,10 @@ static void *zend_ffi_create_callback(zend_ffi_type *type, zval *value) /* {{{ *
 	if (ffi_prep_closure_loc(callback, &callback_data->cif, zend_ffi_callback_trampoline, callback_data, code) != FFI_OK) {
 		zend_throw_error(zend_ffi_exception_ce, "Cannot prepare callback");
 free_on_failure: ;
+		ffi_type **arg_types = callback_data->arg_types;
 		for (int i = 0; i < callback_data->arg_count; ++i) {
-			if (callback_data->arg_types[i]->type == FFI_TYPE_STRUCT) {
-				efree(callback_data->arg_types[i]);
+			if (arg_types[i]->type == FFI_TYPE_STRUCT) {
+				efree(arg_types);
 			}
 		}
 		if (callback_data->ret_type->type == FFI_TYPE_STRUCT) {