[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c

2012-04-12 Thread Johannes Schluuml;ter 
Commit:aa45b5405e472eda27067c0abcc2f7065337baee
Author:Yasuo Ohgaki yohg...@ohgaki.net Thu, 29 Mar 2012 19:48:58 
+0900
Committer: Johannes Schlüter johan...@php.net  Thu, 12 Apr 2012 11:08:46 
+0200
Parents:   74c92f77c197385ea72703b6f3e0de3bf58c1efd
Branches:  PHP-5.3.11

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=aa45b5405e472eda27067c0abcc2f7065337baee

Log:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)

Bugs:
https://bugs.php.net/60718

Changed paths:
  M  ext/pgsql/pgsql.c


Diff:
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ebc17a3..4a92944 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4807,7 +4807,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) {
@@ -4818,7 +4820,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);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c

2012-03-29 Thread Yasuo Ohgaki 
Commit:8449e0ca89d77fb20ac3326a0cf574ae2d13676c
Author:Yasuo Ohgaki yohg...@ohgaki.net Thu, 29 Mar 2012 19:48:58 
+0900
Parents:   fb124764de04ccd1249dd192d874ee04aada7dc0
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8449e0ca89d77fb20ac3326a0cf574ae2d13676c

Log:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)

Bugs:
https://bugs.php.net/60718

Changed paths:
  M  ext/pgsql/pgsql.c


Diff:
8449e0ca89d77fb20ac3326a0cf574ae2d13676c
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ebc17a3..4a92944 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4807,7 +4807,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) {
@@ -4818,7 +4820,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);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c

2012-03-29 Thread Yasuo Ohgaki 
Commit:931831bf75d645bdb9f079793b0224bb4843a7a3
Author:Yasuo Ohgaki yohg...@ohgaki.net Thu, 29 Mar 2012 19:48:58 
+0900
Parents:   55b1e612421c52ea0bb8a3772095c5bbd62045db
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=931831bf75d645bdb9f079793b0224bb4843a7a3

Log:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)

Bugs:
https://bugs.php.net/60718

Changed paths:
  M  ext/pgsql/pgsql.c


Diff:
931831bf75d645bdb9f079793b0224bb4843a7a3
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ebc17a3..4a92944 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4807,7 +4807,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) {
@@ -4818,7 +4820,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);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php