From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- external/coinmp/odr.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 external/coinmp/odr.patch (limited to 'external/coinmp/odr.patch') diff --git a/external/coinmp/odr.patch b/external/coinmp/odr.patch new file mode 100644 index 0000000000..6e91c86415 --- /dev/null +++ b/external/coinmp/odr.patch @@ -0,0 +1,30 @@ +--- Cbc/src/CbcSolver.cpp ++++ Cbc/src/CbcSolver.cpp +@@ -970,8 +970,13 @@ + this set of calls thread-safe. + */ + ++#if defined _MSC_VER + int CbcOrClpRead_mode = 1; + FILE * CbcOrClpReadCommand = stdin; ++#else ++extern int CbcOrClpRead_mode; ++extern FILE * CbcOrClpReadCommand; ++#endif + extern int CbcOrClpEnvironmentIndex; + + int callCbc1(const char * input2, CbcModel & model, +--- Clp/src/CbcOrClpParam.cpp ++++ Clp/src/CbcOrClpParam.cpp +@@ -1233,7 +1233,11 @@ + static char line[1000]; + static char * where = NULL; + extern int CbcOrClpRead_mode; ++#if defined _MSC_VER || !defined COIN_HAS_CBC + int CbcOrClpEnvironmentIndex = -1; ++#else ++extern int CbcOrClpEnvironmentIndex; ++#endif + static size_t fillEnv() + { + #if defined(_MSC_VER) || defined(__MSVCRT__) -- cgit v1.2.3