archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix some extension builds

Browse source
This commit is contained in:
Anatol Belski 2014-09-25 20:02:48 +02:00
parent 83fac1855f
commit 31cc63b1a4
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/intl/converter/converter.c
View file

@ -230,7 +230,7 @@ static void php_converter_to_u_callback(const void *context,
zval retval;
zval zargs[4];
#ifdef ZTS
TSRMLS_D = objval->tsrm_ls;
void ***tsrm_ls = objval->tsrm_ls;
#endif
ZVAL_LONG(&zargs[0], reason);
@ -309,7 +309,7 @@ static void php_converter_from_u_callback(const void *context,
zval zargs[4];
int i;
#ifdef ZTS
TSRMLS_D = objval->tsrm_ls;
void ***tsrm_ls = objval->tsrm_ls;
#endif
ZVAL_LONG(&zargs[0], reason);
@ -1046,7 +1046,7 @@ static zend_object *php_converter_object_ctor(zend_class_entry *ce, php_converte
zend_object_std_init(&objval->obj, ce TSRMLS_CC );
#ifdef ZTS
objval->tsrm_ls = TSRMLS_C;
objval->tsrm_ls = tsrm_get_ls_cache();
#endif
intl_error_init(&(objval->error) TSRMLS_CC);

7
ext/mysqlnd/mysqlnd_debug.c
View file

@ -39,8 +39,6 @@ static const char * const mysqlnd_debug_empty_string = "";
static enum_func_status
MYSQLND_METHOD(mysqlnd_debug, open)(MYSQLND_DEBUG * self, zend_bool reopen)
{
MYSQLND_ZTS(self);
if (!self->file_name) {
return FAIL;
}
@ -67,7 +65,6 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
unsigned int flags = self->flags;
char pid_buffer[10], time_buffer[30], file_buffer[200],
line_buffer[6], level_buffer[7];
MYSQLND_ZTS(self);
if (!self->stream && FAIL == self->m->open(self, FALSE)) {
return FAIL;
@ -165,7 +162,6 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
unsigned int flags = self->flags;
char pid_buffer[10], time_buffer[30], file_buffer[200],
line_buffer[6], level_buffer[7];
MYSQLND_ZTS(self);
if (!self->stream && FAIL == self->m->open(self, FALSE)) {
return FAIL;
@ -436,7 +432,6 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin
static enum_func_status
MYSQLND_METHOD(mysqlnd_debug, close)(MYSQLND_DEBUG * self)
{
MYSQLND_ZTS(self);
if (self->stream) {
#ifndef MYSQLND_PROFILING_DISABLED
if (!(self->flags & MYSQLND_DEBUG_FLUSH) && (self->flags & MYSQLND_DEBUG_PROFILE_CALLS)) {
@ -719,7 +714,7 @@ mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC)
{
MYSQLND_DEBUG *ret = calloc(1, sizeof(MYSQLND_DEBUG));
#ifdef ZTS
ret->TSRMLS_C = TSRMLS_C;
ret->tsrm_ls = tsrm_get_ls_cache();
#endif
ret->nest_level_limit = 0;
ret->pid = getpid();

2
ext/mysqlnd/mysqlnd_debug.h
View file

@ -46,7 +46,7 @@ struct st_mysqlnd_debug
{
php_stream *stream;
#ifdef ZTS
TSRMLS_D;
void ***tsrm_ls;
#endif
unsigned int flags;
unsigned int nest_level_limit;

2
ext/phar/phar_internal.h
View file

@ -197,7 +197,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
#ifdef ZTS
# include "TSRM.h"
# define PHAR_G(v) TSRMG(phar_globals_id, zend_phar_globals *, v)
# define PHAR_GLOBALS ((zend_phar_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(phar_globals_id)])
# define PHAR_GLOBALS ((zend_phar_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(phar_globals_id)])
#else
# define PHAR_G(v) (phar_globals.v)
# define PHAR_GLOBALS (&phar_globals)