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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)