[Libreoffice-commits] core.git: external/coinmp

[Stephan Bergmann (via logerrit)]

 external/coinmp/UnpackedTarball_coinmp.mk        |    1 +
 external/coinmp/Wnon-c-typedef-for-linkage.patch |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 4188c7e2132ec3f1c3e879c179e92ff75c86d24f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Feb 9 23:29:14 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Feb 10 08:03:34 2020 +0100

    external/coinmp: -Werror,-Wnon-c-typedef-for-linkage
    
    ...with recent Clant trunk, see <https://github.com/llvm/llvm-project/commit/
    7ae1b4a0ce9c7f269cf3069e41496a78e3f28d49> "Implement P1766R1: diagnose giving
    non-C-compatible classes a typedef name for linkage purposes."
    
    Change-Id: I3c72f0e4c2f04dd197fb8af1581cd03f465cd87d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88352
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 35cfbfcdbae8..0b0af2c868df 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/ubsan.patch.0 \
 	external/coinmp/rpath.patch \
 	external/coinmp/libtool.patch \
+	external/coinmp/Wnon-c-typedef-for-linkage.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/Wnon-c-typedef-for-linkage.patch b/external/coinmp/Wnon-c-typedef-for-linkage.patch
new file mode 100644
index 000000000000..ace749d2347b
--- /dev/null
+++ b/external/coinmp/Wnon-c-typedef-for-linkage.patch
@@ -0,0 +1,14 @@
+--- Clp/src/Clp_C_Interface.h
++++ Clp/src/Clp_C_Interface.h
+@@ -12,9 +12,9 @@
+ #include "Coin_C_defines.h"
+ 
+ #if defined (CLP_EXTERN_C)
+-typedef struct {
++struct Clp_Solve {
+   ClpSolve options;
+-} Clp_Solve;
++};
+ #else
+ typedef void Clp_Solve;
+ #endif