From 1061308ba7160b89e64adf0349a3a297137e9a8b Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Wed, 21 Oct 2020 22:58:51 +0000 Subject: Welcome PHP 8.0 RC 2 to the ports tree There are many greater changes including: - json is now part of core - xmlrpc is removed - More than 150 backward incompatible changes Have a look at: https://github.com/php/php-src/blob/php-8.0.0RC2/UPGRADING Reviewed by: ale, mfechner, Pascal Christen Sponsored by: PHP Update Service Differential Revision: https://reviews.freebsd.org/D26848 --- databases/php80-mysqli/files/patch-mysqli__api.c | 12 ++++++++++++ .../php80-mysqli/files/patch-php_mysqli_structs.h | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 databases/php80-mysqli/files/patch-mysqli__api.c create mode 100644 databases/php80-mysqli/files/patch-php_mysqli_structs.h (limited to 'databases/php80-mysqli/files') diff --git a/databases/php80-mysqli/files/patch-mysqli__api.c b/databases/php80-mysqli/files/patch-mysqli__api.c new file mode 100644 index 000000000000..a100e8205fb6 --- /dev/null +++ b/databases/php80-mysqli/files/patch-mysqli__api.c @@ -0,0 +1,12 @@ +--- mysqli_api.c.orig 2020-09-29 22:36:51 UTC ++++ mysqli_api.c +@@ -29,7 +29,9 @@ + #include "zend_smart_str.h" + #include "php_mysqli_structs.h" + #include "mysqli_priv.h" ++#if defined(MYSQLI_USE_MYSQLND) + #include "ext/mysqlnd/mysql_float_to_double.h" ++#endif + + #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num)) + diff --git a/databases/php80-mysqli/files/patch-php_mysqli_structs.h b/databases/php80-mysqli/files/patch-php_mysqli_structs.h new file mode 100644 index 000000000000..68568dd214fd --- /dev/null +++ b/databases/php80-mysqli/files/patch-php_mysqli_structs.h @@ -0,0 +1,20 @@ +--- php_mysqli_structs.h.orig 2010-07-26 15:52:54.000000000 +0200 ++++ php_mysqli_structs.h 2010-07-26 15:53:14.000000000 +0200 +@@ -36,7 +36,7 @@ + #define FALSE 0 + #endif + +-#ifdef MYSQLI_USE_MYSQLND ++#if defined(MYSQLI_USE_MYSQLND) + #include "ext/mysqlnd/mysqlnd.h" + #include "mysqli_mysqlnd.h" + #else +@@ -53,6 +53,8 @@ + #undef HAVE_MBSTATE_T + #define WE_HAD_MBSTATE_T + #endif ++ ++typedef zend_ulong ulong; + + #if defined(ulong) && !defined(HAVE_ULONG) + #define HAVE_ULONG -- cgit v1.2.3