cvs: php4 /ext/ncurses config.m4 ncurses_functions.c

hholzgra Mon Sep 17 18:11:55 2001 EDT Modified files: /php4/ext/ncurses config.m4 ncurses_functions.c Log: yet another ncurses 4.x fix Index: php4/ext/ncurses/config.m4 diff -u php4/ext/ncurses/config.m4:1.3 php4/ext/ncurses/config.m4:1.4 --- php4/ext/ncurses/config.m4:1.3 Mon Sep 17 17:59:14 2001 +++ php4/ext/ncurses/config.m4 Mon Sep 17 18:11:55 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2001/09/17 21:59:14 hholzgra Exp $ +dnl $Id: config.m4,v 1.4 2001/09/17 22:11:55 hholzgra Exp $ dnl config.m4 for extension ncurses PHP_ARG_WITH(ncurses, for ncurses support, @@ -42,6 +42,7 @@ AC_CHECK_LIB(ncurses, color_set, [AC_DEFINE(HAVE_NCURSES_COLOR_SET, 1, [ ])]) AC_CHECK_LIB(ncurses, slk_color, [AC_DEFINE(HAVE_NCURSES_SLK_COLOR, 1, [ ])]) + AC_CHECK_LIB(ncurses, asume_default_colors, [AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS, 1, [ ])]) AC_CHECK_LIB(ncurses, use_extended_names, [AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES, 1, [ ])]) Index: php4/ext/ncurses/ncurses_functions.c diff -u php4/ext/ncurses/ncurses_functions.c:1.6 php4/ext/ncurses/ncurses_functions.c:1.7 --- php4/ext/ncurses/ncurses_functions.c:1.6 Mon Sep 17 18:00:38 2001 +++ php4/ext/ncurses/ncurses_functions.c Mon Sep 17 18:11:55 2001 @@ -1360,6 +1360,7 @@ */ PHP_FUNCTION(ncurses_assume_default_colors) { +#ifdef HAVE_NCURSES_ASSUME_DEFAULT_COLORS zval **i1,**i2; if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &i1, &i2) == FAILURE) { @@ -1370,6 +1371,10 @@ convert_to_long_ex(i2); RETURN_LONG(assume_default_colors(_INT(i1),_INT(i2))); +#else + php_error(E_WARNING,"%s not supported in this build"); + RETURN_FALSE; +#endif } /* }}} */