Skip to content

Commit ffb840e

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 3d4b8e0 + 167c45d commit ffb840e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cmake/ext/pdo_pgsql/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ if(TARGET PostgreSQL::PostgreSQL)
8787
set(CMAKE_REQUIRED_LIBRARIES PostgreSQL::PostgreSQL)
8888

8989
# PostgreSQL library minimum version sanity check.
90-
check_symbol_exists(PQencryptPasswordConn libpq-fe.h _PHP_LIBPQ_CHECK)
91-
if(NOT _PHP_LIBPQ_CHECK)
90+
check_symbol_exists(PQencryptPasswordConn libpq-fe.h PHP_HAS_LIBPQ_SANITY_CHECK)
91+
if(NOT PHP_HAS_LIBPQ_SANITY_CHECK)
9292
message(
9393
FATAL_ERROR
9494
"PostgreSQL check failed: libpq ${PHP_POSTGRESQL_MIN_VERSION} or later "

cmake/ext/pgsql/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ if(TARGET PostgreSQL::PostgreSQL)
9191
set(CMAKE_REQUIRED_LIBRARIES PostgreSQL::PostgreSQL)
9292

9393
# PostgreSQL library minimum version sanity check.
94-
check_symbol_exists(PQencryptPasswordConn libpq-fe.h _PHP_LIBPQ_CHECK)
95-
if(NOT _PHP_LIBPQ_CHECK)
94+
check_symbol_exists(PQencryptPasswordConn libpq-fe.h PHP_HAS_LIBPQ_SANITY_CHECK)
95+
if(NOT PHP_HAS_LIBPQ_SANITY_CHECK)
9696
message(
9797
FATAL_ERROR
9898
"PostgreSQL check failed: libpq ${PHP_POSTGRESQL_MIN_VERSION} or later "

0 commit comments

Comments
 (0)