sync pdo code and fix error

swoole · Jun 8, 2024 · c091e3e · c091e3e
1 parent d62d292
commit c091e3e
Show file tree

Hide file tree

Showing 17 changed files with 5,957 additions and 10 deletions.
diff --git a/ext-src/php_swoole_call_stack.h b/ext-src/php_swoole_call_stack.h
@@ -14,14 +14,12 @@
   +----------------------------------------------------------------------+
 */
 
-#pragma once
-
 #include "php_swoole.h"
 
 #ifdef ZEND_CHECK_STACK_LIMIT
 #define HOOK_PHP_CALL_STACK(callback)                                                                                  \
-    auto __stack_limit = EG(stack_limit);                                                                              \
-    auto __stack_base = EG(stack_base);                                                                                \
+    void *__stack_limit = EG(stack_limit);                                                                             \
+    void *__stack_base = EG(stack_base);                                                                               \
     EG(stack_base) = (void *) 0;                                                                                       \
     EG(stack_limit) = (void *) 0;                                                                                      \
     callback EG(stack_limit) = __stack_limit;                                                                          \

diff --git a/thirdparty/php81/pdo_oci/oci_driver.c b/thirdparty/php81/pdo_oci/oci_driver.c
@@ -17,7 +17,8 @@
 #define SW_USE_ORACLE_HOOK
 #include "php_swoole_oracle.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"

diff --git a/thirdparty/php81/pdo_oci/oci_statement.c b/thirdparty/php81/pdo_oci/oci_statement.c
@@ -16,7 +16,8 @@
 #define SW_USE_ORACLE_HOOK
 #include "php_swoole_oracle.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"

diff --git a/thirdparty/php81/pdo_odbc/odbc_driver.c b/thirdparty/php81/pdo_odbc/odbc_driver.c
@@ -17,7 +17,7 @@
 #define SW_USE_ODBC_HOOK
 #include "php_swoole_odbc.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_odbc/odbc_stmt.c b/thirdparty/php81/pdo_odbc/odbc_stmt.c
@@ -17,7 +17,7 @@
 #define SW_USE_ODBC_HOOK
 #include "php_swoole_odbc.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_pgsql/pgsql_driver.c b/thirdparty/php81/pdo_pgsql/pgsql_driver.c
@@ -19,7 +19,7 @@
 #define SW_USE_PGSQL_HOOK
 #include "php_swoole_pgsql.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_pgsql/pgsql_statement.c b/thirdparty/php81/pdo_pgsql/pgsql_statement.c
@@ -19,7 +19,7 @@
 #define SW_USE_PGSQL_HOOK
 #include "php_swoole_pgsql.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"