fix error

swoole · Sep 11, 2024 · faec23c · faec23c
1 parent 9e55e62
commit faec23c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 1,075 deletions.
diff --git a/ext-src/php_swoole_coroutine.h b/ext-src/php_swoole_coroutine.h
@@ -36,7 +36,6 @@
 
 #define SW_DEFAULT_MAX_CORO_NUM 100000
 #define SW_DEFAULT_PHP_STACK_PAGE_SIZE 8192
-enum sw_exit_flags { SW_EXIT_IN_COROUTINE = 1 << 1, SW_EXIT_IN_SERVER = 1 << 2 };
 
 #define SWOG ((zend_output_globals *) &OG(handlers))
 

diff --git a/ext-src/php_swoole_private.h b/ext-src/php_swoole_private.h
@@ -182,10 +182,6 @@ extern zend_object_handlers swoole_exception_handlers;
 extern zend_class_entry *swoole_error_ce;
 extern zend_class_entry *swoole_resolve_context_ce;
 extern zend_object_handlers swoole_resolve_context_handlers;
-#if PHP_VERSION_ID >= 80400
-extern zend_class_entry *swoole_exit_exception_ce;
-extern zend_object_handlers swoole_exit_exception_handlers;
-#endif
 
 PHP_FUNCTION(swoole_clear_dns_cache);
 PHP_FUNCTION(swoole_last_error);

diff --git a/ext-src/swoole_coroutine.cc b/ext-src/swoole_coroutine.cc
@@ -57,6 +57,8 @@ static zend_always_inline zend_vm_stack zend_vm_stack_new_page(size_t size, zend
 }
 #endif
 
+enum sw_exit_flags { SW_EXIT_IN_COROUTINE = 1 << 1, SW_EXIT_IN_SERVER = 1 << 2 };
+
 bool PHPCoroutine::activated = false;
 zend_array *PHPCoroutine::options = nullptr;
 
@@ -85,15 +87,10 @@ static unordered_map<long, Coroutine *> user_yield_coros;
 static void (*orig_interrupt_function)(zend_execute_data *execute_data) = nullptr;
 
 static zend_class_entry *swoole_coroutine_util_ce;
-static zend_class_entry *swoole_coroutine_iterator_ce;
-static zend_class_entry *swoole_coroutine_context_ce;
-#if PHP_VERSION_ID >= 80400
-zend_class_entry *swoole_exit_exception_ce;
-zend_object_handlers swoole_exit_exception_handlers;
-#else
 static zend_class_entry *swoole_exit_exception_ce;
 static zend_object_handlers swoole_exit_exception_handlers;
-#endif
+static zend_class_entry *swoole_coroutine_iterator_ce;
+static zend_class_entry *swoole_coroutine_context_ce;
 
 SW_EXTERN_C_BEGIN
 static PHP_METHOD(swoole_coroutine, exists);

diff --git a/ext-src/swoole_runtime.cc b/ext-src/swoole_runtime.cc
@@ -18,10 +18,6 @@
 #include "swoole_socket.h"
 #include "swoole_util.h"
 
-#if PHP_VERSION_ID >= 80400
-#include "swoole_server.h"
-#endif
-
 #include "thirdparty/php/standard/proc_open.h"
 #ifdef SW_USE_CURL
 #if PHP_VERSION_ID >= 80400