From 5baef94d009ce1d6ec1dd118b9715711f3dfca82 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 13 Jun 2024 13:34:08 +0200 Subject: [PATCH] Remove conditional usage of PQfreemem (#14559) PQfreemem is available since PostgreSQL 7.4. --- ext/pgsql/config.w32 | 2 +- ext/pgsql/pgsql.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ext/pgsql/config.w32 b/ext/pgsql/config.w32 index e1ee38c3000..603239c4314 100644 --- a/ext/pgsql/config.w32 +++ b/ext/pgsql/config.w32 @@ -7,7 +7,7 @@ if (PHP_PGSQL != "no") { CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PGSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\include\\libpq;" + PHP_PGSQL)) { EXTENSION("pgsql", "pgsql.c", PHP_PGSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); - ADD_FLAG("CFLAGS_PGSQL", "/D PGSQL_EXPORTS /D HAVE_PQFREEMEM /D HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT" + (X64 ? " /D HAVE_PG_LO64" : "") + " "); + ADD_FLAG("CFLAGS_PGSQL", "/D PGSQL_EXPORTS /D HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT" + (X64 ? " /D HAVE_PG_LO64" : "") + " "); ADD_EXTENSION_DEP('pgsql', 'pcre'); } else { WARNING("pgsql not enabled; libraries and headers not found"); diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index ca526e1bb6f..5d23741b0c0 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -112,10 +112,6 @@ char pgsql_libpq_version[16]; RETURN_THROWS(); \ } -#ifndef HAVE_PQFREEMEM -#define PQfreemem free -#endif - #ifndef HAVE_PQERRORS_SQLSTATE #define PQERRORS_SQLSTATE 0 #endif