Skip to content

Commit b0470d1

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: ext/pgsql: Fix preprocessor guard typo that silently disabled a feature
2 parents 10e02b0 + 35d98cb commit b0470d1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/pgsql/pgsql.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
* @cvalue PGSQL_DML_STRING
433433
*/
434434
const PGSQL_DML_STRING = UNKNOWN;
435-
#ifdef PQTRACE_SUPPPRESS_TIMESTAMPS
435+
#ifdef PQTRACE_SUPPRESS_TIMESTAMPS
436436
/**
437437
* @var int
438438
* @cvalue PQTRACE_SUPPRESS_TIMESTAMPS

ext/pgsql/pgsql_arginfo.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)