cleanup

diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index 17bfce2c5639fbe77f0d3ae10a679681139d9e73..370c1b45bdaa4a1539e15392103dc35a75466cbb 100644 (file)
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.c
@@ -146,30 +146,6 @@ PHP_MINFO_FUNCTION(ncurses)
    so that your module can be compiled into PHP, it exists only for testing
    purposes. */
 
-/* Every user-visible function in PHP should document itself in the source */
-/* {{{ proto string confirm_ncurses_compiled(string arg)
-   Return a string to confirm that the module is compiled in */
-PHP_FUNCTION(confirm_ncurses_compiled)
-{
-    zval **arg;
-    int len;
-    char string[256];
-
-    if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
-        WRONG_PARAM_COUNT;
-    }
-
-    convert_to_string_ex(arg);
-
-    len = sprintf(string, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "ncurses", Z_STRVAL_PP(arg));
-    RETURN_STRINGL(string, len, 1);
-}
-/* }}} */
-/* The previous line is meant for vim and emacs, so it can correctly fold and 
-   unfold functions in source code. See the corresponding marks just before 
-   function definition, where the functions purpose is also documented. Please 
-   follow this convention for the convenience of others editing your code.
-*/
 
 
 /*

diff --git a/ext/ncurses/ncurses_fe.c b/ext/ncurses/ncurses_fe.c
index 8942de23f89880afcec58398619d6502e7da2515..aea1995785c96a3aceb0758597f8c4a9f02506c4 100644 (file)
--- a/ext/ncurses/ncurses_fe.c
+++ b/ext/ncurses/ncurses_fe.c
@@ -30,7 +30,6 @@
  * Every user visible function must have an entry in ncurses_functions[].
  */
 function_entry ncurses_functions[] = {
-  PHP_FE(confirm_ncurses_compiled,  NULL)   /* For testing, remove later. */
   PHP_FE(ncurses_addch, NULL)
   PHP_FE(ncurses_color_set, NULL)
   PHP_FE(ncurses_delwin, NULL)

diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h
index a08864a99cc63eeffb5eab13d6230a481d234d90..95b80c336cfa5398d6577d8bcb664a2a86460779 100644 (file)
--- a/ext/ncurses/php_ncurses.h
+++ b/ext/ncurses/php_ncurses.h
@@ -22,10 +22,6 @@
 
 #include <curses.h>
 
-#define _STRING(x) ((*x)->value.str.val)
-#define _INT(x)    ((*x)->value.lval)
-#define _HASH(x)   ((*x)->value.ht)
-
 extern int le_ncurses;
 
 extern zend_module_entry ncurses_module_entry;

diff --git a/ext/ncurses/php_ncurses_fe.h b/ext/ncurses/php_ncurses_fe.h
index d5d3c0a85ee848d724e7242217b1622e5951ab77..aa979c539c3a5783ba3be7db11338e0fbe79643c 100644 (file)
--- a/ext/ncurses/php_ncurses_fe.h
+++ b/ext/ncurses/php_ncurses_fe.h
@@ -20,7 +20,6 @@
 #ifndef PHP_NCURSES_FE_H
 #define PHP_NCURSES_FE_H
 
-PHP_FUNCTION(confirm_ncurses_compiled); /* For testing, remove later. */
 PHP_FUNCTION(ncurses_addch);
 PHP_FUNCTION(ncurses_color_set);
 PHP_FUNCTION(ncurses_delwin);