projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'master' of git.php.net:/pecl/database/pq
[m6w6/ext-pq]
/
src
/
php_pqres.c
diff --git
a/src/php_pqres.c
b/src/php_pqres.c
index a9ab9c7c562c67d733ff7f7f1b0a4cfcb0d9af24..2853275dfc85fbc72984fa613ea2cbc43dbfe337 100644
(file)
--- a/
src/php_pqres.c
+++ b/
src/php_pqres.c
@@
-17,9
+17,10
@@
#include <php.h>
#include <ext/spl/spl_iterators.h>
#include <php.h>
#include <ext/spl/spl_iterators.h>
-#if
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
#endif
+
#include <libpq-events.h>
#include "php_pq.h"
#include <libpq-events.h>
#include "php_pq.h"