new test

[m6w6/ext-psi] / src / module.c

diff --git a/src/module.c b/src/module.c
index 08db8149c8db7ae22a65346237b1fe779dc8c453..de8b50ee500b40eca180309bc284e9b7e7fad6f4 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
 #include "php.h"
 #include "php_ini.h"
@@ -117,6 +121,7 @@ PHP_INI_END();
 static zend_object_handlers psi_object_handlers;
 static zend_class_entry *psi_class_entry;
 
+zend_class_entry *psi_object_get_class_entry();
 zend_class_entry *psi_object_get_class_entry()
 {
        return psi_class_entry;
@@ -166,7 +171,7 @@ static PHP_FUNCTION(psi_dump)
 {
        php_stream *s;
        zval *r = NULL;
-       struct psi_dump dump = {.fun = php_stream_printf};
+       struct psi_dump dump = {.fun = (psi_dump_cb) php_stream_printf};
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
                return;
@@ -284,6 +289,7 @@ static PHP_FUNCTION(psi_validate_string)
        psi_parser_input_free(&I);
 }
 
+PHP_MINIT_FUNCTION(psi_debug);
 PHP_MINIT_FUNCTION(psi_cpp);
 PHP_MINIT_FUNCTION(psi_builtin);
 PHP_MINIT_FUNCTION(psi_context);
@@ -305,6 +311,9 @@ static PHP_MINIT_FUNCTION(psi)
        psi_object_handlers.free_obj = psi_object_free;
        psi_object_handlers.clone_obj = NULL;
 
+       if (SUCCESS != PHP_MINIT(psi_debug)(type, module_number)) {
+               return FAILURE;
+       }
        if (SUCCESS != PHP_MINIT(psi_builtin)(type, module_number)) {
                return FAILURE;
        }
@@ -321,11 +330,13 @@ static PHP_MINIT_FUNCTION(psi)
 PHP_MSHUTDOWN_FUNCTION(psi_cpp);
 PHP_MSHUTDOWN_FUNCTION(psi_builtin);
 PHP_MSHUTDOWN_FUNCTION(psi_context);
+PHP_MSHUTDOWN_FUNCTION(psi_debug);
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
        PHP_MSHUTDOWN(psi_context)(type, module_number);
        PHP_MSHUTDOWN(psi_cpp)(type, module_number);
        PHP_MSHUTDOWN(psi_builtin)(type, module_number);
+       PHP_MSHUTDOWN(psi_debug)(type, module_number);
 
        UNREGISTER_INI_ENTRIES();