diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2020-01-30 09:44:31 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2020-01-30 09:44:31 +0000 |
| commit | ce74d170665c816073bc1e0fe0e6780ba04a7a24 (patch) | |
| tree | cefef68b0a6a691e278cf04c0150051c67bfc3a6 /databases/php74-mysqli | |
| parent | databases/foundationdb-devel: skip non-amd64 arch (diff) | |
databases/php7[234]-mysqli: unbreak build with system mysql when MYSQLND is disabled
This is follow-up to r522540 which introduced ability to build with MYSQLND=off
PR: 243643
Submitted by: fluffy
Approved by: maintainer (tz)
Notes
Notes:
svn path=/head/; revision=524638
Diffstat (limited to 'databases/php74-mysqli')
| -rw-r--r-- | databases/php74-mysqli/files/patch-mysqli__api.c | 13 | ||||
| -rw-r--r-- | databases/php74-mysqli/files/patch-php_mysqli_structs.h | 20 |
2 files changed, 28 insertions, 5 deletions
diff --git a/databases/php74-mysqli/files/patch-mysqli__api.c b/databases/php74-mysqli/files/patch-mysqli__api.c new file mode 100644 index 000000000000..2d88e061f9da --- /dev/null +++ b/databases/php74-mysqli/files/patch-mysqli__api.c @@ -0,0 +1,13 @@ +--- mysqli_api.c.orig 2019-12-17 10:29:23 UTC ++++ mysqli_api.c +@@ -31,8 +31,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 + + #if !defined(MYSQLI_USE_MYSQLND) + /* {{{ mysqli_tx_cor_options_to_string */ diff --git a/databases/php74-mysqli/files/patch-php_mysqli_structs.h b/databases/php74-mysqli/files/patch-php_mysqli_structs.h index d0daeee9ee54..68568dd214fd 100644 --- a/databases/php74-mysqli/files/patch-php_mysqli_structs.h +++ b/databases/php74-mysqli/files/patch-php_mysqli_structs.h @@ -1,10 +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 -@@ -54,6 +54,7 @@ - #define WE_HAD_MBSTATE_T +@@ -36,7 +36,7 @@ + #define FALSE 0 #endif -+#define HAVE_ULONG 1 - #include <my_global.h> +-#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(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) + #if defined(ulong) && !defined(HAVE_ULONG) + #define HAVE_ULONG |