mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
This commit is contained in:
commit
aecf5485e3
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user