diff options
| author | Yasuo Ohgaki <yohgaki@ohgaki.net> | 2012-03-29 19:55:06 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@ohgaki.net> | 2012-03-29 19:55:06 +0900 |
| commit | aecf5485e3af6a1e405f29f653353ae1237dbb3e (patch) | |
| tree | fb5c623fbcc07f0c2cd0f94d68803378442cd062 | |
| parent | 1d8664b90b4007b81206d39f3453eb4e7987776d (diff) | |
| parent | 931831bf75d645bdb9f079793b0224bb4843a7a3 (diff) | |
| download | php-git-aecf5485e3af6a1e405f29f653353ae1237dbb3e.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
| -rw-r--r-- | ext/pgsql/pgsql.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 5702fe2032..d8127af8c1 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4787,7 +4787,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) { @@ -4798,7 +4800,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); |