Browse Source

Fixed bug #21146.

PHP-5
Ilia Alshanetsky 24 years ago
parent
commit
0ae3050aa5
  1. 10
      ext/ncurses/ncurses.c
  2. 255
      ext/ncurses/ncurses_functions.c
  3. 1
      ext/ncurses/php_ncurses.h

10
ext/ncurses/ncurses.c

@ -84,19 +84,15 @@ PHP_INI_END()
#define PHP_NCURSES_CONST(x) REGISTER_LONG_CONSTANT("NCURSES_"#x, x, CONST_CS | CONST_PERSISTENT)
#define PHP_NCURSES_FKEY_CONST(x) REGISTER_LONG_CONSTANT("NCURSES_KEY_F"#x, KEY_F0 + x, CONST_CS | CONST_PERSISTENT)
/* {{{ php_ncurses_globals_ctor */
static void php_ncurses_globals_ctor(zend_ncurses_globals *pglobals)
static void php_ncurses_init_globals(zend_ncurses_globals *ncurses_globals)
{
pglobals->registered_constants = 0;
pglobals->is_initialised = 0;
memset(ncurses_globals, 0, sizeof(*ncurses_globals));
}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(ncurses)
{
ZEND_INIT_MODULE_GLOBALS(ncurses, php_ncurses_globals_ctor, NULL);
/* color constants */
PHP_NCURSES_CONST(COLOR_BLACK);
PHP_NCURSES_CONST(COLOR_RED);
@ -255,6 +251,8 @@ PHP_MINIT_FUNCTION(ncurses)
PHP_NCURSES_CONST(ALL_MOUSE_EVENTS);
PHP_NCURSES_CONST(REPORT_MOUSE_POSITION);
ZEND_INIT_MODULE_GLOBALS(ncurses, php_ncurses_init_globals, NULL);
le_ncurses_windows = zend_register_list_destructors_ex(ncurses_destruct_window, NULL, "ncurses_window", module_number);
#if HAVE_NCURSES_PANEL
le_ncurses_panels = zend_register_list_destructors_ex(ncurses_destruct_panel, NULL, "ncurses_panel", module_number);

255
ext/ncurses/ncurses_functions.c
File diff suppressed because it is too large
View File

1
ext/ncurses/php_ncurses.h

@ -48,7 +48,6 @@ PHP_RSHUTDOWN_FUNCTION(ncurses);
PHP_MINFO_FUNCTION(ncurses);
ZEND_BEGIN_MODULE_GLOBALS(ncurses)
int is_initialised;
int registered_constants;
ZEND_END_MODULE_GLOBALS(ncurses)

Loading…
Cancel
Save