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 crash on reverse dependency from conn to stm
[m6w6/ext-pq]
/
src
/
php_pq_params.c
diff --git
a/src/php_pq_params.c
b/src/php_pq_params.c
index 6ac55af7c14c56f6c03ef48f96a545d0fe375d63..9554ef70f23e6f59442b0af7fbab4496a6b76f93 100644
(file)
--- a/
src/php_pq_params.c
+++ b/
src/php_pq_params.c
@@
-17,8
+17,8
@@
#include <php.h>
#include <ext/standard/php_string.h>
#include <ext/standard/php_smart_str.h>
#include <php.h>
#include <ext/standard/php_string.h>
#include <ext/standard/php_smart_str.h>
-#if
def HAVE_JSON
-#include <
ext/json/php_json.h>
+#if
PHP_PQ_HAVE_PHP_JSON_H
+#include <
php_json.h> /* we've added the include directory to INCLUDES */
#endif
#include <Zend/zend_interfaces.h>
#endif
#include <Zend/zend_interfaces.h>
@@
-88,7
+88,7
@@
static zval *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type TSR
smart_str str = {0};
switch (type) {
smart_str str = {0};
switch (type) {
-#if
HAVE_JSON
&& defined(PHP_PQ_OID_JSON)
+#if
PHP_PQ_HAVE_PHP_JSON_H
&& defined(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
@@
-227,7
+227,7
@@
static zval *array_param_to_string(php_pq_params_t *p, zval *zarr, Oid type TSRM
struct apply_to_param_from_array_arg arg = {NULL};
switch (type) {
struct apply_to_param_from_array_arg arg = {NULL};
switch (type) {
-#if
HAVE_JSON
&& defined(PHP_PQ_OID_JSON)
+#if
PHP_PQ_HAVE_PHP_JSON_H
&& defined(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