projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix #47: JSON conv broken since 2.2.1
[m6w6/ext-pq]
/
src
/
php_pq_params.c
diff --git
a/src/php_pq_params.c
b/src/php_pq_params.c
index 259fbb9a13b1c4b6e3c2d243e5106f39c1e9763d..9e92226f7b3f83b5fe07e03cb4681768bbd2fa60 100644
(file)
--- a/
src/php_pq_params.c
+++ b/
src/php_pq_params.c
@@
-16,9
+16,7
@@
#include <php.h>
#include <ext/standard/php_string.h>
#include <php.h>
#include <ext/standard/php_string.h>
-#if PHP_PQ_HAVE_PHP_JSON_H
-#include <php_json.h> /* we've added the include directory to INCLUDES */
-#endif
+#include <ext/json/php_json.h>
#include <Zend/zend_smart_str.h>
#include <Zend/zend_interfaces.h>
#include <Zend/zend_smart_str.h>
#include <Zend/zend_interfaces.h>
@@
-75,12
+73,12
@@
unsigned php_pq_params_add_type_oid(php_pq_params_t *p, Oid type)
static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type)
{
static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type)
{
-#if
PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
+#if
def PHP_PQ_OID_JSON
smart_str str = {0};
#endif
switch (type) {
smart_str str = {0};
#endif
switch (type) {
-#if
PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
+#if
def PHP_PQ_OID_JSON
# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
# endif
# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
# endif
@@
-207,7
+205,7
@@
static zend_string *array_param_to_string(php_pq_params_t *p, zval *zarr, Oid ty
struct apply_to_param_from_array_arg arg = {NULL};
switch (type) {
struct apply_to_param_from_array_arg arg = {NULL};
switch (type) {
-#if
PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
+#if
def PHP_PQ_OID_JSON
# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
# endif
# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
# endif