summaryrefslogtreecommitdiff
path: root/external/firebird
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-09-17 12:32:54 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-09-17 13:27:08 +0200
commit3c967717d315fba0aa7b1a1ba3567edc0a88bb69 (patch)
tree0d495afc4ea511a81c99d9432f669ced65a2bd91 /external/firebird
parentce8256032edef03320f9d6ba6deba85977209e8f (diff)
external/firebird: Fix -Wincompatible-function-pointer-types
...after Clang 16 trunk <https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62> "Default implicit function pointer conversions diagnostic to be an error" Change-Id: Ibe06a94f45010efdeaf0c05a661f269e7a07d561 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140095 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/firebird')
-rw-r--r--external/firebird/UnpackedTarball_firebird.mk1
-rwxr-xr-xexternal/firebird/Wincompatible-function-pointer-types.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 0233ce24dbf4..1f76870b8d18 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/wnt-per-process-trace-storage.patch.1 \
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
external/firebird/configure-c99.patch \
+ external/firebird/Wincompatible-function-pointer-types.patch \
))
ifeq ($(OS),WNT)
diff --git a/external/firebird/Wincompatible-function-pointer-types.patch b/external/firebird/Wincompatible-function-pointer-types.patch
new file mode 100755
index 000000000000..d5482bdcf2c2
--- /dev/null
+++ b/external/firebird/Wincompatible-function-pointer-types.patch
@@ -0,0 +1,11 @@
+--- extern/cloop/src/tests/test1/CTest.c
++++ extern/cloop/src/tests/test1/CTest.c
+@@ -402,7 +402,7 @@
+ struct CALC_IFactory* (*createFactory)();
+
+ #ifdef WIN32
+- createFactory = (struct Factory* (*)()) GetProcAddress(library, "createFactory");
++ createFactory = (struct CALC_IFactory* (*)()) GetProcAddress(library, "createFactory");
+ #else
+ createFactory = dlsym(library, "createFactory");
+ #endif