embedaddon/php/ext/com_dotnet/com_wrapper.c - diff

Return to com_wrapper.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / com_dotnet

Diff for /embedaddon/php/ext/com_dotnet/com_wrapper.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:47:53	version 1.1.1.2, 2012/05/29 12:34:36
Line 52 typedef struct {	Line 52 typedef struct {

static int le_dispatch;	static int le_dispatch;

static void disp_destructor(php_dispatchex *disp);	static void disp_destructor(php_dispatchex *disp TSRMLS_DC);

static void dispatch_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)	static void dispatch_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{	{
php_dispatchex disp = (php_dispatchex )rsrc->ptr;	php_dispatchex disp = (php_dispatchex )rsrc->ptr;
disp_destructor(disp);	disp_destructor(disp TSRMLS_CC);
}	}

int php_com_wrapper_minit(INIT_FUNC_ARGS)	int php_com_wrapper_minit(INIT_FUNC_ARGS)
Line 86 static inline void trace(char *fmt, ...)	Line 86 static inline void trace(char *fmt, ...)
}	}
/* }}} */	/* }}} */

#ifdef ZTS
# define TSRMLS_FIXED() TSRMLS_FETCH();
#else
# define TSRMLS_FIXED()
#endif

#define FETCH_DISP(methname) \	#define FETCH_DISP(methname) \
TSRMLS_FIXED() \
php_dispatchex disp = (php_dispatchex)This; \	php_dispatchex disp = (php_dispatchex)This; \
	TSRMLS_FETCH(); \
if (COMG(rshutdown_started)) { \	if (COMG(rshutdown_started)) { \
trace(" PHP Object:%p (name:unknown) %s\n", disp->object, methname); \	trace(" PHP Object:%p (name:unknown) %s\n", disp->object, methname); \
} else { \	} else { \
Line 554 static php_dispatchex disp_constructor(zval object T	Line 548 static php_dispatchex disp_constructor(zval object T
Z_ADDREF_P(object);	Z_ADDREF_P(object);
disp->object = object;	disp->object = object;

disp->id = zend_list_insert(disp, le_dispatch);	disp->id = zend_list_insert(disp, le_dispatch TSRMLS_CC);

return disp;	return disp;
}	}

static void disp_destructor(php_dispatchex *disp)	static void disp_destructor(php_dispatchex *disp TSRMLS_DC)
{	{
TSRMLS_FETCH();

/* Object store not available during request shutdown */	/* Object store not available during request shutdown */
if (COMG(rshutdown_started)) {	if (COMG(rshutdown_started)) {
trace("destroying COM wrapper for PHP object %p (name:unknown)\n", disp->object);	trace("destroying COM wrapper for PHP object %p (name:unknown)\n", disp->object);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2