X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_module.c;h=1fe68f5e4ce5270672ab3692418fee9806668d95;hp=cb7a4e9713454c3f4a601af26d844ae0f25c109a;hb=753359f19c5d29f08faca43ee735c49c217230a7;hpb=88440266c0a9fa8354688b5ed0d2a6cc3bf04db5 diff --git a/src/php_pq_module.c b/src/php_pq_module.c index cb7a4e9..1fe68f5 100644 --- a/src/php_pq_module.c +++ b/src/php_pq_module.c @@ -20,18 +20,6 @@ #include -/* -#include -#include -#include -#include -#include - -#include -#include -#include -*/ - #include "php_pq.h" #include "php_pq_misc.h" #include "php_pqcancel.h" @@ -62,6 +50,7 @@ static PHP_MINIT_FUNCTION(pq) PHP_MINIT_CALL(pqres); PHP_MINIT_CALL(pqstm); PHP_MINIT_CALL(pqtxn); + PHP_MINIT_CALL(pqcur); PHP_MINIT_CALL(pqcopy); PHP_MINIT_CALL(pqlob); @@ -100,7 +89,7 @@ static PHP_MINFO_FUNCTION(pq) php_info_print_table_start(); php_info_print_table_header(2, "PQ Support", "enabled"); - php_info_print_table_row(2, "Extension Version", PHP_PQ_EXT_VERSION); + php_info_print_table_row(2, "Extension Version", PHP_PQ_VERSION); php_info_print_table_end(); php_info_print_table_start(); @@ -113,13 +102,14 @@ static PHP_MINFO_FUNCTION(pq) php_info_print_table_end(); } -const zend_function_entry pq_functions[] = { +static const zend_function_entry pq_functions[] = { {0} }; static zend_module_dep pq_module_deps[] = { ZEND_MOD_REQUIRED("raphf") ZEND_MOD_REQUIRED("spl") + ZEND_MOD_OPTIONAL("json") ZEND_MOD_END }; @@ -134,7 +124,7 @@ zend_module_entry pq_module_entry = { NULL,/*PHP_RINIT(pq),*/ NULL,/*PHP_RSHUTDOWN(pq),*/ PHP_MINFO(pq), - PHP_PQ_EXT_VERSION, + PHP_PQ_VERSION, STANDARD_MODULE_PROPERTIES };