summaryrefslogtreecommitdiff
path: root/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c
diff options
context:
space:
mode:
authorTorsten Zuehlsdorff <tz@FreeBSD.org>2020-01-09 22:13:13 +0000
committerTorsten Zuehlsdorff <tz@FreeBSD.org>2020-01-09 22:13:13 +0000
commit3a2e913f6665ec663b59fb069c6f755257d19d31 (patch)
treea22d1fe3c2d5be2ee3dce0f9dc60155596a5e55f /lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c
parentUnbreak databases/php73-mysqli when lang/php73 is build with MYSQLND=off (diff)
Unbreak databases/php74-mysqli when lang/php74 is build with MYSQLND=off
Currently when building lang/php74 with MYSQLND=off, its im possible to build databases/php74-mysqli. When the option MYSQLND was added, we expected users to not use mysqli at all after disabling this option. This has proven to be wrong, so we patch the build to be work again. patch-ext_mysqli_mysqli__api.c was submitted by Сергей <joker@pinnet.ru>. Merge patches from r522539 into this commit and add two additional patches.
Diffstat (limited to 'lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c')
-rw-r--r--lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c
new file mode 100644
index 000000000000..9baa04218bf9
--- /dev/null
+++ b/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c
@@ -0,0 +1,12 @@
+--- ext/mysqli/mysqli_nonapi.c.orig 2020-01-09 11:40:57 UTC
++++ ext/mysqli/mysqli_nonapi.c
+@@ -28,7 +28,9 @@
+ #include "php_ini.h"
+ #include "ext/standard/info.h"
+ #include "zend_smart_str.h"
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "php_mysqli_structs.h"
++#endif
+ #include "mysqli_priv.h"
+
+ #define SAFE_STR(a) ((a)?a:"")