summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@ohgaki.net>2012-03-29 20:06:00 +0900
committerYasuo Ohgaki <yohgaki@ohgaki.net>2012-03-29 20:06:00 +0900
commit48033ed48d235be7dcfa8894e7dee6966cd4d2d7 (patch)
treecb5b837550804c748956b39fb1124d55b0ce4111
parentdde1bff4c6463a0ff8ed70449eea0e50451e99e8 (diff)
parentaecf5485e3af6a1e405f29f653353ae1237dbb3e (diff)
downloadphp-git-48033ed48d235be7dcfa8894e7dee6966cd4d2d7.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
-rw-r--r--ext/pgsql/pgsql.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 327ce0737a..e54b8243ba 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4924,7 +4924,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_index_string(return_value, 2, pgsql_notify->extra, 1);
+#endif
}
}
if (result_type & PGSQL_ASSOC) {
@@ -4935,7 +4937,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);
+#endif
}
}
PQfreemem(pgsql_notify);