1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
diff -up php-5.3.9/ext/mysqli/mysqli_api.c.incl php-5.3.9/ext/mysqli/mysqli_api.c
--- php-5.3.9/ext/mysqli/mysqli_api.c.incl 2012-01-10 20:27:59.643042949 +0100
+++ php-5.3.9/ext/mysqli/mysqli_api.c 2012-01-10 20:28:22.447043495 +0100
@@ -24,8 +24,6 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "php_globals.h"
@@ -33,6 +31,8 @@
#include "php_mysqli_structs.h"
#include "mysqli_priv.h"
+#include <signal.h>
+
/* {{{ proto mixed mysqli_affected_rows(object link)
Get number of affected rows in previous MySQL operation */
PHP_FUNCTION(mysqli_affected_rows)
diff -up php-5.3.9/ext/mysqli/mysqli.c.incl php-5.3.9/ext/mysqli/mysqli.c
--- php-5.3.9/ext/mysqli/mysqli.c.incl 2012-01-10 20:27:33.087042313 +0100
+++ php-5.3.9/ext/mysqli/mysqli.c 2012-01-10 20:28:38.944043890 +0100
@@ -24,8 +24,6 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
@@ -34,6 +32,8 @@
#include "mysqli_priv.h"
#include "zend_exceptions.h"
+#include <signal.h>
+
ZEND_DECLARE_MODULE_GLOBALS(mysqli)
static PHP_GINIT_FUNCTION(mysqli);
diff -up php-5.3.9/ext/mysqli/mysqli_driver.c.incl php-5.3.9/ext/mysqli/mysqli_driver.c
--- php-5.3.9/ext/mysqli/mysqli_driver.c.incl 2012-01-10 20:27:28.476042203 +0100
+++ php-5.3.9/ext/mysqli/mysqli_driver.c 2012-01-10 20:28:43.822044006 +0100
@@ -20,8 +20,6 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
@@ -29,6 +27,8 @@
#include "zend_exceptions.h"
#include "mysqli_fe.h"
+#include <signal.h>
+
#define MAP_PROPERTY_MYG_BOOL_READ(name, value) \
static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
{ \
diff -up php-5.3.9/ext/mysqli/mysqli_embedded.c.incl php-5.3.9/ext/mysqli/mysqli_embedded.c
--- php-5.3.9/ext/mysqli/mysqli_embedded.c.incl 2012-01-10 20:27:18.844041973 +0100
+++ php-5.3.9/ext/mysqli/mysqli_embedded.c 2012-01-10 20:28:56.059044300 +0100
@@ -20,13 +20,13 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_mysqli_structs.h"
+#include <signal.h>
+
/* {{{ proto bool mysqli_embedded_server_start(bool start, array arguments, array groups)
initialize and start embedded server */
PHP_FUNCTION(mysqli_embedded_server_start)
diff -up php-5.3.9/ext/mysqli/mysqli_exception.c.incl php-5.3.9/ext/mysqli/mysqli_exception.c
--- php-5.3.9/ext/mysqli/mysqli_exception.c.incl 2012-01-10 20:27:50.753042737 +0100
+++ php-5.3.9/ext/mysqli/mysqli_exception.c 2012-01-10 20:28:14.808043313 +0100
@@ -20,8 +20,6 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
@@ -29,6 +27,8 @@
#include "mysqli_priv.h"
#include "zend_exceptions.h"
+#include <signal.h>
+
/* {{{ mysqli_exception_methods[]
*/
const zend_function_entry mysqli_exception_methods[] = {
diff -up php-5.3.9/ext/mysqli/mysqli_fe.c.incl php-5.3.9/ext/mysqli/mysqli_fe.c
--- php-5.3.9/ext/mysqli/mysqli_fe.c.incl 2012-01-10 20:27:37.755042425 +0100
+++ php-5.3.9/ext/mysqli/mysqli_fe.c 2012-01-10 20:28:33.556043762 +0100
@@ -24,8 +24,6 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
@@ -33,6 +31,8 @@
#include "mysqli_fe.h"
#include "mysqli_priv.h"
+#include <signal.h>
+
#if PHP_VERSION_ID >= 50399
#define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
#define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result, mysqli_result, 0)
diff -up php-5.3.9/ext/mysqli/mysqli_nonapi.c.incl php-5.3.9/ext/mysqli/mysqli_nonapi.c
--- php-5.3.9/ext/mysqli/mysqli_nonapi.c.incl 2012-01-10 20:27:23.883042093 +0100
+++ php-5.3.9/ext/mysqli/mysqli_nonapi.c 2012-01-10 20:28:50.658044170 +0100
@@ -24,14 +24,14 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_mysqli_structs.h"
#include "mysqli_priv.h"
+#include <signal.h>
+
#define SAFE_STR(a) ((a)?a:"")
#ifndef zend_parse_parameters_none
diff -up php-5.3.9/ext/mysqli/mysqli_prop.c.incl php-5.3.9/ext/mysqli/mysqli_prop.c
--- php-5.3.9/ext/mysqli/mysqli_prop.c.incl 2012-01-10 20:27:44.023042575 +0100
+++ php-5.3.9/ext/mysqli/mysqli_prop.c 2012-01-10 20:28:27.766043623 +0100
@@ -22,14 +22,14 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_mysqli_structs.h"
#include "mysqli_priv.h"
+#include <signal.h>
+
#define CHECK_STATUS(value) \
if (!obj->ptr || ((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Property access is not allowed yet"); \
diff -up php-5.3.9/ext/mysqli/mysqli_warning.c.incl php-5.3.9/ext/mysqli/mysqli_warning.c
--- php-5.3.9/ext/mysqli/mysqli_warning.c.incl 2012-01-10 20:28:07.855043147 +0100
+++ php-5.3.9/ext/mysqli/mysqli_warning.c 2012-01-10 20:29:01.012044418 +0100
@@ -20,14 +20,14 @@
#include "config.h"
#endif
-#include <signal.h>
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_mysqli_structs.h"
#include "mysqli_priv.h"
+#include <signal.h>
+
/* Define these in the PHP5 tree to make merging easy process */
#define ZSTR_DUPLICATE (1<<0)
#define ZSTR_AUTOFREE (1<<1)
|
