Merge branch 'PHP-5.3' into PHP-5.4

yohgaki · yohgaki · commit aecf5485e3af · 2012-03-29T19:55:06.000+09:00
* PHP-5.3:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -4787,7 +4787,9 @@ PHP_FUNCTION(pg_get_notify)`
`4787`	`4787`	`#else`
`4788`	`4788`	`if (atof(PG_VERSION) >= 9.0) {`
`4789`	`4789`	`#endif`
	`4790`	`+#if HAVE_PQPARAMETERSTATUS`
`4790`	`4791`	`add_index_string(return_value, 2, pgsql_notify->extra, 1);`
	`4792`	`+#endif`
`4791`	`4793`	`}`
`4792`	`4794`	`}`
`4793`	`4795`	`if (result_type & PGSQL_ASSOC) {`
`@@ -4798,7 +4800,9 @@ PHP_FUNCTION(pg_get_notify)`
`4798`	`4800`	`#else`
`4799`	`4801`	`if (atof(PG_VERSION) >= 9.0) {`
`4800`	`4802`	`#endif`
	`4803`	`+#if HAVE_PQPARAMETERSTATUS`
`4801`	`4804`	`add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);`
	`4805`	`+#endif`
`4802`	`4806`	`}`
`4803`	`4807`	`}`
`4804`	`4808`	`PQfreemem(pgsql_notify);`