projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
better checks for json support
[m6w6/ext-pq]
/
src
/
php_pq_misc.c
diff --git
a/src/php_pq_misc.c
b/src/php_pq_misc.c
index ab90936428f20377d81c5ff84fdd915669c6ab07..2bc430c7c57202d3e5f45d765942034477de585a 100644
(file)
--- a/
src/php_pq_misc.c
+++ b/
src/php_pq_misc.c
@@
-17,9
+17,6
@@
#include <php.h>
#include <ext/date/php_date.h>
#include <ext/standard/php_string.h>
#include <php.h>
#include <ext/date/php_date.h>
#include <ext/standard/php_string.h>
-#if defined(HAVE_JSON) && !defined(COMPILE_DL_JSON)
-# include <ext/json/php_json.h>
-#endif
#include <Zend/zend_interfaces.h>
#include <Zend/zend_interfaces.h>
@@
-142,12
+139,14
@@
zend_class_entry *php_pqconv_class_entry;
ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_types, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_types, 0, 0, 0)
ZEND_END_ARG_INFO();
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_from_string, 0, 0,
1
)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_from_string, 0, 0,
2
)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, data)
+ ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO();
ZEND_END_ARG_INFO();
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0,
1
)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0,
2
)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, data)
+ ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO();
zend_function_entry php_pqconv_methods[] = {
ZEND_END_ARG_INFO();
zend_function_entry php_pqconv_methods[] = {