Merge branch 'PHP-8.4'

php · Jan 21, 2025 · 3337f22 · 3337f22
2 parents aa76127 + fa21fce
commit 3337f22
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
@@ -28,18 +28,22 @@ if test "$PHP_PGSQL" != "no"; then
       [Define to 1 if libpq has the 'PQsocketPoll' function (PostgreSQL 17 or
       later).])],,
     [$PGSQL_LIBS])
-  PHP_CHECK_LIBRARY([pq], [PQsetChunkedRowsMode],
-    [AC_DEFINE([HAVE_PG_SET_CHUNKED_ROWS_SIZE], [1],
-      [Define to 1 if libpq has the 'PQsetChunkedRowsMode' function (PostgreSQL
-      17 or later).])],,
-    [$PGSQL_LIBS])
   PHP_CHECK_LIBRARY([pq], [PQclosePrepared],
     [AC_DEFINE([HAVE_PG_CLOSE_STMT], [1], [PostgreSQL 17 or later])],,
     [$PGSQL_LIBS])
 
   old_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS $PGSQL_CFLAGS"
 
+  AC_CHECK_DECLS([PGRES_TUPLES_CHUNK],
+    PHP_CHECK_LIBRARY([pq], [PQsetChunkedRowsMode],
+      [AC_DEFINE([HAVE_PG_SET_CHUNKED_ROWS_SIZE], [1],
+        [Define to 1 if libpq has the 'PQsetChunkedRowsMode' function (PostgreSQL
+        17 or later).])],,
+      [$PGSQL_LIBS]),,
+      [#include <libpq-fe.h>]
+  )
+
   dnl Available since PostgreSQL 12.
   AC_CACHE_CHECK([if PGVerbosity enum has PQERRORS_SQLSTATE],
     [php_cv_enum_pgverbosity_pqerrors_sqlstate],