- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).

diff --git a/NEWS b/NEWS
index 109373ce2feb4466b47cd53068fcec40287bb3b0..9c2f3de4851c032cb7e30b61b3631b27217cd47f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 4                                                                      NEWS
 ?? ??? 20??, Version 4.?.?
 - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
   them sort based on the current locale. (Derick)
+- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
+  (Derick)
 - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
 - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
   (Ilia)

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index be536c83b10dea0cd3584d47362f3e2f653c8865..e16455ff1194e0fe90f4b1f5f862866003299fe0 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -100,7 +100,9 @@ function_entry pgsql_functions[] = {
        PHP_FE(pg_fetch_array,  NULL)
        PHP_FE(pg_fetch_object, NULL)
        PHP_FE(pg_fetch_all,    NULL)
+#if HAVE_PQCMDTUPLES
        PHP_FE(pg_affected_rows,NULL)
+#endif
        PHP_FE(pg_get_result,   NULL)
        PHP_FE(pg_result_seek,  NULL)
        PHP_FE(pg_result_status,NULL)
@@ -1077,6 +1079,7 @@ PHP_FUNCTION(pg_num_fields)
 }
 /* }}} */
 
+#if HAVE_PQCMDTUPLES
 /* {{{ proto int pg_affected_rows(resource result)
    Returns the number of affected tuples */
 PHP_FUNCTION(pg_affected_rows)
@@ -1084,6 +1087,7 @@ PHP_FUNCTION(pg_affected_rows)
        php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_CMD_TUPLES);
 }
 /* }}} */
+#endif
 
 /* {{{ proto string pg_last_notice(resource connection)
    Returns the last notice set by the backend */

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index afad746c6c917348d2cbddf0f55a5b6b3781ca1d..b1cecdf8d59227397d206ae4d95e2ba1f4d87c26 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -83,7 +83,9 @@ PHP_FUNCTION(pg_fetch_object);
 PHP_FUNCTION(pg_fetch_result);
 PHP_FUNCTION(pg_fetch_row);
 PHP_FUNCTION(pg_fetch_all);
+#if HAVE_PQCMDTUPLES
 PHP_FUNCTION(pg_affected_rows);
+#endif
 PHP_FUNCTION(pg_get_result);
 PHP_FUNCTION(pg_result_seek);
 PHP_FUNCTION(pg_result_status);