Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVojtech Kral <vojtech@kral.hk>2018-05-04 17:06:53 +0300
committerVojtech Kral <vojtech@kral.hk>2018-05-21 19:58:22 +0300
commit07817c8ee53e1690d0de8e848fc4b42388b630a5 (patch)
treefa24b43700e59f24cc1470295fd0b644be1da48f /xs/src/avrdude/avrdude-slic3r.cpp
parent68a570221b995b91acf3a0489a538c95c27965a6 (diff)
avrdude: Compilation on Windows/MSVC
Diffstat (limited to 'xs/src/avrdude/avrdude-slic3r.cpp')
-rw-r--r--xs/src/avrdude/avrdude-slic3r.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/xs/src/avrdude/avrdude-slic3r.cpp b/xs/src/avrdude/avrdude-slic3r.cpp
index 37da0a530..9f9093aa2 100644
--- a/xs/src/avrdude/avrdude-slic3r.cpp
+++ b/xs/src/avrdude/avrdude-slic3r.cpp
@@ -16,19 +16,20 @@ static void avrdude_message_handler_ostream(const char *msg, unsigned size, void
os << msg;
}
-int main(std::vector<std::string> args, std::string sys_config, std::ostream &stderr)
+int main(std::vector<std::string> args, std::string sys_config, std::ostream &os)
{
std::vector<char *> c_args {{ const_cast<char*>(PACKAGE_NAME) }};
for (const auto &arg : args) {
c_args.push_back(const_cast<char*>(arg.data()));
}
- ::avrdude_message_handler_set(avrdude_message_handler_ostream, reinterpret_cast<void*>(&stderr));
+ ::avrdude_message_handler_set(avrdude_message_handler_ostream, reinterpret_cast<void*>(&os));
const auto res = ::avrdude_main(static_cast<int>(c_args.size()), c_args.data(), sys_config.c_str());
::avrdude_message_handler_set(nullptr, nullptr);
return res;
}
+
}
}