Skip to content

Commit 5cbcd8d

Browse files
committed
Update
1 parent fe647f1 commit 5cbcd8d

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

.github/julia/bundled/patches/fixes.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@
99
LPWSTR lpFilePart;
1010
DWORD nBufferLength = GetFullPathNameW(utf8_to_wide(f).c_str(), 0, nullptr, &lpFilePart);
1111
auto* lpBuffer = static_cast<LPWSTR>(LocalAlloc(LMEM_FIXED, sizeof(WCHAR) * nBufferLength));
12+
--- a/minizinc.cpp
13+
+++ b/minizinc.cpp
14+
@@ -89,7 +89,7 @@ int run(const std::string& exe, const std::vector<std::string>& args, bool jsonS
15+
16+
} // namespace
17+
18+
-#ifdef _WIN32
19+
+#if defined(_WIN32) && !defined(__MINGW32__)
20+
#include <minizinc/interrupt.hh>
21+
22+
int wmain(int argc, wchar_t* argv[], wchar_t* envp[]) {
23+
@@ -121,7 +121,9 @@ int wmain(int argc, wchar_t* argv[], wchar_t* envp[]) {
24+
}
25+
#else
26+
int main(int argc, const char** argv) {
27+
+ #if !defined(__MINGW32__)
28+
OverflowHandler::install(argv);
29+
+ #endif
30+
std::vector<std::string> args(argc - 1);
31+
bool jsonStream = false;
32+
for (int i = 1; i < argc; i++) {
1233
--- a/include/minizinc/file_utils.hh
1334
+++ b/include/minizinc/file_utils.hh
1435
@@ -16,7 +16,7 @@

0 commit comments

Comments
 (0)