Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos4LargeBnds

fwesselm · fwesselm · commit 2ab17c5c7aae · 2024-06-05T09:18:46.000+02:00
diff --git a/extern/zstr/strict_fstream.hpp b/extern/zstr/strict_fstream.hpp
@@ -64,7 +64,7 @@ static std::string strerror()
     } else {
         return "Unknown error (" + std::to_string(err_num) + ")";
     }
-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__APPLE__) || defined(__FreeBSD__)) && ! _GNU_SOURCE) || defined(__MUSL__)
+#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && ! _GNU_SOURCE) || defined(__MUSL__)
 // XSI-compliant strerror_r()
     const int err_num = errno; // See above
     if (strerror_r(err_num, buff.data(), buff.size()) == 0) {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static std::string strerror()`
`64`	`64`	`} else {`
`65`	`65`	`return "Unknown error (" + std::to_string(err_num) + ")";`
`66`	`66`	`}`
`67`		`-#elif ((_POSIX_C_SOURCE >= 200112L \|\| _XOPEN_SOURCE >= 600 \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)) && ! _GNU_SOURCE) \|\| defined(__MUSL__)`
	`67`	`+#elif ((_POSIX_C_SOURCE >= 200112L \|\| _XOPEN_SOURCE >= 600 \|\| defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__OpenBSD__)) && ! _GNU_SOURCE) \|\| defined(__MUSL__)`
`68`	`68`	`// XSI-compliant strerror_r()`
`69`	`69`	`const int err_num = errno; // See above`
`70`	`70`	`if (strerror_r(err_num, buff.data(), buff.size()) == 0) {`