X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pq_module.c;h=b567b4b12063c8d390ac6b71f3a18978b2ab6fd6;hb=a06db6d217fc8ba0fd9b8273a9e595477d59afcc;hp=057bdee7559147f9ebf3a6c257fb39962fd36a60;hpb=a4c00b076141f01809e6fab6f9953188d6348812;p=m6w6%2Fext-pq

diff --git a/src/php_pq_module.c b/src/php_pq_module.c
index 057bdee..b567b4b 100644
--- a/src/php_pq_module.c
+++ b/src/php_pq_module.c
@@ -18,25 +18,14 @@
 #include <php.h>
 #include <ext/standard/info.h>
 
-#include <libpq-fe.h>
-
-/*
-#include <Zend/zend_interfaces.h>
-#include <Zend/zend_exceptions.h>
-#include <ext/spl/spl_array.h>
-#include <ext/spl/spl_exceptions.h>
-#include <ext/raphf/php_raphf.h>
-
 #include <libpq-events.h>
-#include <libpq/libpq-fs.h>
-#include <fnmatch.h>
-*/
 
 #include "php_pq.h"
 #include "php_pq_misc.h"
 #include "php_pqcancel.h"
 #include "php_pqconn.h"
 #include "php_pqcopy.h"
+#include "php_pqcur.h"
 #include "php_pqexc.h"
 #include "php_pqlob.h"
 #include "php_pqres.h"
@@ -62,6 +51,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);
@@ -81,6 +71,7 @@ static PHP_MSHUTDOWN_FUNCTION(pq)
 
 	PHP_MSHUT_CALL(pqlob);
 	PHP_MSHUT_CALL(pqcopy);
+	PHP_MSHUT_CALL(pqcur);
 	PHP_MSHUT_CALL(pqtxn);
 	PHP_MSHUT_CALL(pqstm);
 	PHP_MSHUT_CALL(pqres);
@@ -104,22 +95,23 @@ static PHP_MINFO_FUNCTION(pq)
 	php_info_print_table_end();
 
 	php_info_print_table_start();
-	php_info_print_table_header(2, "Used Library", "Version");
+	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 #ifdef HAVE_PQLIBVERSION
 	libpq_v = PQlibVersion();
 	slprintf(libpq_version, sizeof(libpq_version), "%d.%d.%d", libpq_v/10000%100, libpq_v/100%100, libpq_v%100);
 #endif
-	php_info_print_table_row(2, "libpq", libpq_version);
+	php_info_print_table_row(3, "libpq", PHP_PQ_LIBVERSION, libpq_version);
 	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
 };