Skip to content

Commit f57c0b3

Browse files
nikicnikic
committed
Merge branch 'PHP-7.0'
2 parents a9a2610 + 1ac1529 commit f57c0b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+97
-93
lines changed

‎TSRM/TSRM.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
170170

171171
#define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element)
172172
#define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
173-
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
174-
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
173+
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
174+
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
175175
#if ZEND_DEBUG
176176
#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
177177
#else

‎TSRM/tsrm_win32.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct {
7272

7373
#ifdef ZTS
7474
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
75-
TSRMLS_CACHE_EXTERN();
75+
TSRMLS_CACHE_EXTERN()
7676
#else
7777
# define TWG(v) (win32_globals.v)
7878
#endif

‎Zend/zend.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static HashTable *global_class_table = NULL;
148148
static HashTable *global_constants_table = NULL;
149149
static HashTable *global_auto_globals_table = NULL;
150150
static HashTable *global_persistent_list = NULL;
151-
ZEND_TSRMLS_CACHE_DEFINE();
151+
ZEND_TSRMLS_CACHE_DEFINE()
152152
#endif
153153

154154
ZEND_API zend_utility_values zend_uv;

‎Zend/zend.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#define ZEND_TSRMLS_CACHE
7878
#endif
7979

80-
ZEND_TSRMLS_CACHE_EXTERN();
80+
ZEND_TSRMLS_CACHE_EXTERN()
8181

8282
#ifdef HAVE_NORETURN
8383
# ifdef ZEND_NORETURN_ALIAS

‎ext/bcmath/bcmath.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = {
128128

129129
#ifdef COMPILE_DL_BCMATH
130130
#ifdef ZTS
131-
ZEND_TSRMLS_CACHE_DEFINE();
131+
ZEND_TSRMLS_CACHE_DEFINE()
132132
#endif
133133
ZEND_GET_MODULE(bcmath)
134134
#endif

‎ext/bcmath/php_bcmath.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
5252
ZEND_END_MODULE_GLOBALS(bcmath)
5353

5454
#if defined(ZTS) && defined(COMPILE_DL_BCMATH)
55-
ZEND_TSRMLS_CACHE_EXTERN();
55+
ZEND_TSRMLS_CACHE_EXTERN()
5656
#endif
5757

5858
ZEND_EXTERN_MODULE_GLOBALS(bcmath)

‎ext/com_dotnet/com_extension.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = {
255255

256256
#ifdef COMPILE_DL_COM_DOTNET
257257
#ifdef ZTS
258-
ZEND_TSRMLS_CACHE_DEFINE();
258+
ZEND_TSRMLS_CACHE_DEFINE()
259259
#endif
260260
ZEND_GET_MODULE(com_dotnet)
261261
#endif

‎ext/com_dotnet/php_com_dotnet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com_dotnet)
5656
ZEND_END_MODULE_GLOBALS(com_dotnet)
5757

5858
#if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET)
59-
ZEND_TSRMLS_CACHE_EXTERN();
59+
ZEND_TSRMLS_CACHE_EXTERN()
6060
#endif
6161

6262
extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet);

‎ext/exif/exif.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
155155
#define EXIF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(exif, v)
156156

157157
#if defined(ZTS) && defined(COMPILE_DL_EXIF)
158-
ZEND_TSRMLS_CACHE_DEFINE();
158+
ZEND_TSRMLS_CACHE_DEFINE()
159159
#endif
160160

161161
/* {{{ PHP_INI

‎ext/filter/filter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ zend_module_entry filter_module_entry = {
152152

153153
#ifdef COMPILE_DL_FILTER
154154
#ifdef ZTS
155-
ZEND_TSRMLS_CACHE_DEFINE();
155+
ZEND_TSRMLS_CACHE_DEFINE()
156156
#endif
157157
ZEND_GET_MODULE(filter)
158158
#endif

‎ext/filter/php_filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ZEND_BEGIN_MODULE_GLOBALS(filter)
6666
ZEND_END_MODULE_GLOBALS(filter)
6767

6868
#if defined(COMPILE_DL_FILTER) && defined(ZTS)
69-
ZEND_TSRMLS_CACHE_EXTERN();
69+
ZEND_TSRMLS_CACHE_EXTERN()
7070
#endif
7171

7272
#define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v)

‎ext/gmp/gmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ zend_module_entry gmp_module_entry = {
215215

216216
#ifdef COMPILE_DL_GMP
217217
#ifdef ZTS
218-
ZEND_TSRMLS_CACHE_DEFINE();
218+
ZEND_TSRMLS_CACHE_DEFINE()
219219
#endif
220220
ZEND_GET_MODULE(gmp)
221221
#endif

‎ext/gmp/php_gmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ZEND_END_MODULE_GLOBALS(gmp)
9898
#define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v)
9999

100100
#if defined(ZTS) && defined(COMPILE_DL_GMP)
101-
ZEND_TSRMLS_CACHE_EXTERN();
101+
ZEND_TSRMLS_CACHE_EXTERN()
102102
#endif
103103

104104
#else

‎ext/iconv/iconv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ zend_module_entry iconv_module_entry = {
165165

166166
#ifdef COMPILE_DL_ICONV
167167
#ifdef ZTS
168-
ZEND_TSRMLS_CACHE_DEFINE();
168+
ZEND_TSRMLS_CACHE_DEFINE()
169169
#endif
170170
ZEND_GET_MODULE(iconv)
171171
#endif

‎ext/iconv/php_iconv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ZEND_END_MODULE_GLOBALS(iconv)
7878
#define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v)
7979

8080
#if defined(ZTS) && defined(COMPILE_DL_ICONV)
81-
ZEND_TSRMLS_CACHE_EXTERN();
81+
ZEND_TSRMLS_CACHE_EXTERN()
8282
#endif
8383

8484
#ifdef HAVE_IBM_ICONV

‎ext/interbase/interbase.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ zend_module_entry ibase_module_entry = {
461461

462462
#ifdef COMPILE_DL_INTERBASE
463463
#ifdef ZTS
464-
ZEND_TSRMLS_CACHE_DEFINE();
464+
ZEND_TSRMLS_CACHE_DEFINE()
465465
#endif
466466
ZEND_GET_MODULE(ibase)
467467
#endif

‎ext/interbase/php_ibase_includes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ enum php_interbase_option {
130130
#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
131131

132132
#if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
133-
ZEND_TSRMLS_CACHE_EXTERN();
133+
ZEND_TSRMLS_CACHE_EXTERN()
134134
#endif
135135

136136
#define BLOB_ID_LEN 18

‎ext/intl/php_intl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ zend_module_entry intl_module_entry = {
892892

893893
#ifdef COMPILE_DL_INTL
894894
#ifdef ZTS
895-
ZEND_TSRMLS_CACHE_DEFINE();
895+
ZEND_TSRMLS_CACHE_DEFINE()
896896
#endif
897897
ZEND_GET_MODULE( intl )
898898
#endif

‎ext/intl/php_intl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(intl)
5656
ZEND_END_MODULE_GLOBALS(intl)
5757

5858
#if defined(ZTS) && defined(COMPILE_DL_INTL)
59-
ZEND_TSRMLS_CACHE_EXTERN();
59+
ZEND_TSRMLS_CACHE_EXTERN()
6060
#endif
6161

6262
ZEND_EXTERN_MODULE_GLOBALS(intl)

‎ext/json/json.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ zend_module_entry json_module_entry = {
176176

177177
#ifdef COMPILE_DL_JSON
178178
#ifdef ZTS
179-
ZEND_TSRMLS_CACHE_DEFINE();
179+
ZEND_TSRMLS_CACHE_DEFINE()
180180
#endif
181181
ZEND_GET_MODULE(json)
182182
#endif

‎ext/json/php_json.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
8686
php_json_error_code error_code;
8787
ZEND_END_MODULE_GLOBALS(json)
8888

89-
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json);
89+
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
9090
#define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v)
9191

9292
#if defined(ZTS) && defined(COMPILE_DL_JSON)
93-
ZEND_TSRMLS_CACHE_EXTERN();
93+
ZEND_TSRMLS_CACHE_EXTERN()
9494
#endif
9595

9696
PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options);

‎ext/libxml/libxml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static zend_class_entry *libxmlerror_class_entry;
8080
/* {{{ dynamically loadable module stuff */
8181
#ifdef COMPILE_DL_LIBXML
8282
#ifdef ZTS
83-
ZEND_TSRMLS_CACHE_DEFINE();
83+
ZEND_TSRMLS_CACHE_DEFINE()
8484
#endif
8585
ZEND_GET_MODULE(libxml)
8686
#endif /* COMPILE_DL_LIBXML */

‎ext/libxml/php_libxml.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
118118
#define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v)
119119

120120
#if defined(ZTS) && defined(COMPILE_DL_LIBXML)
121-
ZEND_TSRMLS_CACHE_EXTERN();
121+
ZEND_TSRMLS_CACHE_EXTERN()
122122
#endif
123123

124124
#else /* HAVE_LIBXML */

‎ext/mbstring/mbstring.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ static sapi_post_entry php_post_entries[] = {
591591

592592
#ifdef COMPILE_DL_MBSTRING
593593
#ifdef ZTS
594-
ZEND_TSRMLS_CACHE_DEFINE();
594+
ZEND_TSRMLS_CACHE_DEFINE()
595595
#endif
596596
ZEND_GET_MODULE(mbstring)
597597
#endif

‎ext/mbstring/mbstring.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ struct mb_overload_def {
205205
#define MBSTRG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mbstring, v)
206206

207207
#if defined(ZTS) && defined(COMPILE_DL_MBSTRING)
208-
ZEND_TSRMLS_CACHE_EXTERN();
208+
ZEND_TSRMLS_CACHE_EXTERN()
209209
#endif
210210

211211
#else /* HAVE_MBSTRING */

‎ext/mcrypt/mcrypt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ zend_module_entry mcrypt_module_entry = {
273273

274274
#ifdef COMPILE_DL_MCRYPT
275275
#ifdef ZTS
276-
ZEND_TSRMLS_CACHE_DEFINE();
276+
ZEND_TSRMLS_CACHE_DEFINE()
277277
#endif
278278
ZEND_GET_MODULE(mcrypt)
279279
#endif

‎ext/mysqli/mysqli.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ zend_module_entry mysqli_module_entry = {
10241024

10251025
#ifdef COMPILE_DL_MYSQLI
10261026
#ifdef ZTS
1027-
ZEND_TSRMLS_CACHE_DEFINE();
1027+
ZEND_TSRMLS_CACHE_DEFINE()
10281028
#endif
10291029
ZEND_GET_MODULE(mysqli)
10301030
#endif

‎ext/mysqli/php_mysqli_structs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ ZEND_END_MODULE_GLOBALS(mysqli)
341341
#define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)
342342

343343
#if defined(ZTS) && defined(COMPILE_DL_MYSQLI)
344-
ZEND_TSRMLS_CACHE_EXTERN();
344+
ZEND_TSRMLS_CACHE_EXTERN()
345345
#endif
346346

347347
#define my_estrdup(x) (x) ? estrdup(x) : NULL

‎ext/mysqlnd/mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
332332
#define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v)
333333

334334
#if defined(ZTS) && defined(COMPILE_DL_MYSQLND)
335-
ZEND_TSRMLS_CACHE_EXTERN();
335+
ZEND_TSRMLS_CACHE_EXTERN()
336336
#endif
337337

338338

‎ext/mysqlnd/php_mysqlnd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ zend_module_entry mysqlnd_module_entry = {
360360
/* {{{ COMPILE_DL_MYSQLND */
361361
#ifdef COMPILE_DL_MYSQLND
362362
#ifdef ZTS
363-
ZEND_TSRMLS_CACHE_DEFINE();
363+
ZEND_TSRMLS_CACHE_DEFINE()
364364
#endif
365365
ZEND_GET_MODULE(mysqlnd)
366366
#endif

‎ext/odbc/php_odbc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ zend_module_entry odbc_module_entry = {
412412

413413
#ifdef COMPILE_DL_ODBC
414414
#ifdef ZTS
415-
ZEND_TSRMLS_CACHE_DEFINE();
415+
ZEND_TSRMLS_CACHE_DEFINE()
416416
#endif
417417
ZEND_GET_MODULE(odbc)
418418
#endif

‎ext/odbc/php_odbc_includes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)
308308
#define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v)
309309

310310
#if defined(ZTS) && defined(COMPILE_DL_ODBC)
311-
ZEND_TSRMLS_CACHE_EXTERN();
311+
ZEND_TSRMLS_CACHE_EXTERN()
312312
#endif
313313

314314
#endif /* HAVE_UODBC */

‎ext/opcache/ZendAccelerator.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ zend_accel_globals accel_globals;
9797
#else
9898
int accel_globals_id;
9999
#if defined(COMPILE_DL_OPCACHE)
100-
ZEND_TSRMLS_CACHE_DEFINE();
100+
ZEND_TSRMLS_CACHE_DEFINE()
101101
#endif
102102
#endif
103103

‎ext/opcache/ZendAccelerator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ extern zend_accel_shared_globals *accel_shared_globals;
286286
# define ZCG(v) ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
287287
extern int accel_globals_id;
288288
# ifdef COMPILE_DL_OPCACHE
289-
ZEND_TSRMLS_CACHE_EXTERN();
289+
ZEND_TSRMLS_CACHE_EXTERN()
290290
# endif
291291
#else
292292
# define ZCG(v) (accel_globals.v)

‎ext/pcre/php_pcre.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre)
8181
int error_code;
8282
ZEND_END_MODULE_GLOBALS(pcre)
8383

84-
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre);
84+
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre)
8585
#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v)
8686

8787
#else

‎ext/pdo_dblib/php_pdo_dblib_int.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ ZEND_END_MODULE_GLOBALS(dblib)
137137
# define DBLIB_G(v) (dblib_globals.v)
138138
#endif
139139

140-
ZEND_EXTERN_MODULE_GLOBALS(dblib);
140+
ZEND_EXTERN_MODULE_GLOBALS(dblib)
141141

142142
#endif
143143

‎ext/pdo_mysql/pdo_mysql.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#ifdef COMPILE_DL_PDO_MYSQL
3535
#ifdef ZTS
36-
ZEND_TSRMLS_CACHE_DEFINE();
36+
ZEND_TSRMLS_CACHE_DEFINE()
3737
#endif
3838
ZEND_GET_MODULE(pdo_mysql)
3939
#endif

‎ext/pdo_mysql/php_pdo_mysql_int.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql)
8989
#define PDO_MYSQL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pdo_mysql, v)
9090

9191
#if defined(ZTS) && defined(COMPILE_DL_PDO_MYSQL)
92-
ZEND_TSRMLS_CACHE_EXTERN();
92+
ZEND_TSRMLS_CACHE_EXTERN()
9393
#endif
9494

9595

‎ext/pgsql/pgsql.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ zend_module_entry pgsql_module_entry = {
780780

781781
#ifdef COMPILE_DL_PGSQL
782782
#ifdef ZTS
783-
ZEND_TSRMLS_CACHE_DEFINE();
783+
ZEND_TSRMLS_CACHE_DEFINE()
784784
#endif
785785
ZEND_GET_MODULE(pgsql)
786786
#endif

‎ext/pgsql/php_pgsql.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pgsql)
325325
# define PGG(v) ZEND_MODULE_GLOBALS_ACCESSOR(pgsql, v)
326326

327327
#if defined(ZTS) && defined(COMPILE_DL_PGSQL)
328-
ZEND_TSRMLS_CACHE_EXTERN();
328+
ZEND_TSRMLS_CACHE_EXTERN()
329329
#endif
330330

331331
#endif

‎ext/phar/phar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3212,7 +3212,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
32123212

32133213
#ifdef COMPILE_DL_PHAR
32143214
#ifdef ZTS
3215-
ZEND_TSRMLS_CACHE_DEFINE();
3215+
ZEND_TSRMLS_CACHE_DEFINE()
32163216
#endif
32173217
ZEND_GET_MODULE(phar)
32183218
#endif

‎ext/phar/phar_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
196196
#define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
197197

198198
#if defined(ZTS) && defined(COMPILE_DL_PHAR)
199-
ZEND_TSRMLS_CACHE_EXTERN();
199+
ZEND_TSRMLS_CACHE_EXTERN()
200200
#endif
201201

202202
#include "pharzip.h"

‎ext/session/php_session.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ extern zend_module_entry session_module_entry;
220220
#ifdef ZTS
221221
#define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v)
222222
#ifdef COMPILE_DL_SESSION
223-
ZEND_TSRMLS_CACHE_EXTERN();
223+
ZEND_TSRMLS_CACHE_EXTERN()
224224
#endif
225225
#else
226226
#define PS(v) (ps_globals.v)

0 commit comments

Comments
 (0)