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

Use global ctor in non-ZTS mode as well

Browse source
This commit is contained in:
Sascha Schumann 1999-12-08 19:07:58 +00:00
parent 276c0a378d
commit 01c7fc6c8f
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/standard/assert.c
View file

@ -34,10 +34,18 @@ typedef struct {
} php_assert_globals;
#ifdef ZTS
#define ASSERTLS_D php_assert_globals *assert_globals
#define ASSERTLS_DC , ASSERTLS_D
#define ASSERTLS_C assert_globals
#define ASSERTLS_CC , ASSERTLS_CC
#define ASSERT(v) (assert_globals->v)
#define ASSERTLS_FETCH() php_assert_globals *assert_globals = ts_resource(assert_globals_id)
int assert_globals_id;
#else
#define ASSERTLS_D
#define ASSERTLS_DC
#define ASSERTLS_C
#define ASSERTLS_CC
#define ASSERT(v) (assert_globals.v)
#define ASSERTLS_FETCH()
php_assert_globals assert_globals;
@ -86,12 +94,10 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateInt, quiet_eval, php_assert_globals, assert_globals)
PHP_INI_END()
#ifdef ZTS
static void php_assert_init_globals(php_assert_globals *assert_globals)
static void php_assert_init_globals(ASSERTLS_D)
{
ASSERT(callback) = 0;
}
#endif
PHP_MINIT_FUNCTION(assert)
{
@ -100,7 +106,7 @@ PHP_MINIT_FUNCTION(assert)
ELS_FETCH();
assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL);
#else
ASSERT(callback) = 0;
php_assert_init_globals(ASSERTLS_C);
#endif
REGISTER_INI_ENTRIES();
@ -145,8 +151,6 @@ PHP_RSHUTDOWN_FUNCTION(assert)
PHP_MINFO_FUNCTION(assert)
{
ASSERTLS_FETCH();
DISPLAY_INI_ENTRIES();
}