View | Details | Raw Unified | Return to bug 243643
Collapse All | Expand All

(-)php72-mysqli/files/patch-mysqli__api.c (+13 lines)
Line 0 Link Here
1
--- mysqli_api.c.orig	2020-01-07 10:40:30 UTC
2
+++ mysqli_api.c
3
@@ -33,8 +33,9 @@
4
 #include "zend_smart_str.h"
5
 #include "php_mysqli_structs.h"
6
 #include "mysqli_priv.h"
7
+#if defined(MYSQLI_USE_MYSQLND)
8
 #include "ext/mysqlnd/mysql_float_to_double.h"
9
-
10
+#endif
11
 
12
 #if !defined(MYSQLI_USE_MYSQLND)
13
 /* {{{ mysqli_tx_cor_options_to_string */
(-)php72-mysqli/files/patch-php_mysqli_structs.h (+9 lines)
Lines 1-5 Link Here
1
--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
1
--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
2
+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
2
+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
3
@@ -38,7 +38,7 @@
4
 #define FALSE 0
5
 #endif
6
 
7
-#ifdef MYSQLI_USE_MYSQLND
8
+#if defined(MYSQLI_USE_MYSQLND)
9
 #include "ext/mysqlnd/mysqlnd.h"
10
 #include "mysqli_mysqlnd.h"
11
 #else
3
@@ -54,6 +54,7 @@
12
@@ -54,6 +54,7 @@
4
 #define WE_HAD_MBSTATE_T
13
 #define WE_HAD_MBSTATE_T
5
 #endif
14
 #endif
(-)php73-mysqli/files/patch-mysqli__api.c (+13 lines)
Line 0 Link Here
1
--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
2
+++ mysqli_api.c
3
@@ -31,8 +31,9 @@
4
 #include "zend_smart_str.h"
5
 #include "php_mysqli_structs.h"
6
 #include "mysqli_priv.h"
7
+#if defined(MYSQLI_USE_MYSQLND)
8
 #include "ext/mysqlnd/mysql_float_to_double.h"
9
-
10
+#endif
11
 
12
 #if !defined(MYSQLI_USE_MYSQLND)
13
 /* {{{ mysqli_tx_cor_options_to_string */
(-)php73-mysqli/files/patch-php_mysqli_structs.h (-2 / +11 lines)
Lines 1-5 Link Here
1
--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
1
--- php_mysqli_structs.h.orig	2019-12-17 10:29:23 UTC
2
+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
2
+++ php_mysqli_structs.h
3
@@ -36,7 +36,7 @@
4
 #define FALSE 0
5
 #endif
6
 
7
-#ifdef MYSQLI_USE_MYSQLND
8
+#if defined(MYSQLI_USE_MYSQLND)
9
 #include "ext/mysqlnd/mysqlnd.h"
10
 #include "mysqli_mysqlnd.h"
11
 #else
3
@@ -54,6 +54,7 @@
12
@@ -54,6 +54,7 @@
4
 #define WE_HAD_MBSTATE_T
13
 #define WE_HAD_MBSTATE_T
5
 #endif
14
 #endif
(-)php74-mysqli/files/patch-mysqli__api.c (+13 lines)
Line 0 Link Here
1
--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
2
+++ mysqli_api.c
3
@@ -31,8 +31,9 @@
4
 #include "zend_smart_str.h"
5
 #include "php_mysqli_structs.h"
6
 #include "mysqli_priv.h"
7
+#if defined(MYSQLI_USE_MYSQLND)
8
 #include "ext/mysqlnd/mysql_float_to_double.h"
9
-
10
+#endif
11
 
12
 #if !defined(MYSQLI_USE_MYSQLND)
13
 /* {{{ mysqli_tx_cor_options_to_string */
(-)php74-mysqli/files/patch-php_mysqli_structs.h (-5 / +15 lines)
Lines 1-10 Link Here
1
--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
1
--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
2
+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
2
+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
3
@@ -54,6 +54,7 @@
3
@@ -36,7 +36,7 @@
4
 #define FALSE 0
5
 #endif
6
 
7
-#ifdef MYSQLI_USE_MYSQLND
8
+#if defined(MYSQLI_USE_MYSQLND)
9
 #include "ext/mysqlnd/mysqlnd.h"
10
 #include "mysqli_mysqlnd.h"
11
 #else
12
@@ -53,6 +53,8 @@
13
 #undef HAVE_MBSTATE_T
4
 #define WE_HAD_MBSTATE_T
14
 #define WE_HAD_MBSTATE_T
5
 #endif
15
 #endif
16
+
17
+typedef zend_ulong ulong;
6
 
18
 
7
+#define HAVE_ULONG 1
19
 #if defined(ulong) && !defined(HAVE_ULONG)
8
 #include <my_global.h>
20
 #define HAVE_ULONG
9
 
10
 #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)

Return to bug 243643