From d8113bb80d790bdb6c76d23ac104dc7eae48269d Mon Sep 17 00:00:00 2001 From: BjarneDMat Date: Sun, 12 Apr 2026 14:59:01 +0200 Subject: [PATCH] php-odbc: php{74,80} fix for [-Wincompatible-function-pointer-types] in ext/pdo_odbc/odbc_stmt.c --- lang/php/Portfile | 5 +++++ lang/php/files/patch-php74-odbc-stmt_get_col.diff | 11 +++++++++++ lang/php/files/patch-php80-odbc-stmt_get_col.diff | 11 +++++++++++ 3 files changed, 27 insertions(+) create mode 100644 lang/php/files/patch-php74-odbc-stmt_get_col.diff create mode 100644 lang/php/files/patch-php80-odbc-stmt_get_col.diff diff --git a/lang/php/Portfile b/lang/php/Portfile index a3e1cc0180a..9848f2142b1 100644 --- a/lang/php/Portfile +++ b/lang/php/Portfile @@ -1794,6 +1794,11 @@ subport ${php}-odbc { categories-append databases + if {[vercmp ${branch} <= 8.0]} { + patchfiles-append \ + patch-${php}-odbc-stmt_get_col.diff + } + description a PHP interface for accessing databases via Open \ DataBase Connectivity (ODBC) diff --git a/lang/php/files/patch-php74-odbc-stmt_get_col.diff b/lang/php/files/patch-php74-odbc-stmt_get_col.diff new file mode 100644 index 00000000000..69e407326e9 --- /dev/null +++ b/lang/php/files/patch-php74-odbc-stmt_get_col.diff @@ -0,0 +1,11 @@ +--- ext/pdo_odbc/odbc_stmt.c.orig 2026-04-09 23:19:55 ++++ ext/pdo_odbc/odbc_stmt.c 2026-04-09 23:21:18 +@@ -648,7 +648,7 @@ + return 1; + } + +-static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, zend_ulong *len, int *caller_frees) ++static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_t *len, int *caller_frees) + { + pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data; + pdo_odbc_column *C = &S->cols[colno]; diff --git a/lang/php/files/patch-php80-odbc-stmt_get_col.diff b/lang/php/files/patch-php80-odbc-stmt_get_col.diff new file mode 100644 index 00000000000..e714e6d0718 --- /dev/null +++ b/lang/php/files/patch-php80-odbc-stmt_get_col.diff @@ -0,0 +1,11 @@ +--- ext/pdo_odbc/odbc_stmt.c.orig 2026-04-09 23:14:15 ++++ ext/pdo_odbc/odbc_stmt.c 2026-04-09 23:14:44 +@@ -646,7 +646,7 @@ + return 1; + } + +-static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, zend_ulong *len, int *caller_frees) ++static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_t *len, int *caller_frees) + { + pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data; + pdo_odbc_column *C = &S->cols[colno];