better checks for json support

[m6w6/ext-pq] / src / php_pq_module.c

diff --git a/src/php_pq_module.c b/src/php_pq_module.c
index 786430429b136319020f2de0ae1314da31336a54..86fc93e938310d3fd61568d5a85a9af53a5915e3 100644 (file)
--- a/src/php_pq_module.c
+++ b/src/php_pq_module.c
@@ -20,23 +20,12 @@
 
 #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"
@@ -82,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);
@@ -114,13 +104,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
 };