archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.4'

Browse source 
* PHP-5.4:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
This commit is contained in:
Yasuo Ohgaki 2012-03-29 20:06:00 +09:00
commit 48033ed48d
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pgsql/pgsql.c
View file

@ -4924,7 +4924,9 @@ PHP_FUNCTION(pg_get_notify)
#else #else
if (atof(PG_VERSION) >= 9.0) { if (atof(PG_VERSION) >= 9.0) {
#endif #endif
#if HAVE_PQPARAMETERSTATUS
add_index_string(return_value, 2, pgsql_notify->extra, 1); add_index_string(return_value, 2, pgsql_notify->extra, 1);
#endif
} }
} }
if (result_type & PGSQL_ASSOC) { if (result_type & PGSQL_ASSOC) {
@ -4935,7 +4937,9 @@ PHP_FUNCTION(pg_get_notify)
#else #else
if (atof(PG_VERSION) >= 9.0) { if (atof(PG_VERSION) >= 9.0) {
#endif #endif
#if HAVE_PQPARAMETERSTATUS
add_assoc_string(return_value, "payload", pgsql_notify->extra, 1); add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);
#endif
} }
} }
PQfreemem(pgsql_notify); PQfreemem(pgsql_notify);