diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-09 23:29:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-10 08:03:34 +0100 |
| commit | 4188c7e2132ec3f1c3e879c179e92ff75c86d24f (patch) | |
| tree | 6a3b22725cd27c0b68fb9d1cce5d8e8780d4665c | |
| parent | 2cfa5fbc3e15060c0eb462df25219c96f8aa5935 (diff) | |
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@redhat.com>
| -rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 1 | ||||
| -rw-r--r-- | external/coinmp/Wnon-c-typedef-for-linkage.patch | 14 |
2 files changed, 15 insertions, 0 deletions
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 |