From 07817c8ee53e1690d0de8e848fc4b42388b630a5 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 4 May 2018 16:06:53 +0200 Subject: avrdude: Compilation on Windows/MSVC --- xs/src/avrdude/avrdude-slic3r.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xs/src/avrdude/avrdude-slic3r.cpp') 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 args, std::string sys_config, std::ostream &stderr) +int main(std::vector args, std::string sys_config, std::ostream &os) { std::vector c_args {{ const_cast(PACKAGE_NAME) }}; for (const auto &arg : args) { c_args.push_back(const_cast(arg.data())); } - ::avrdude_message_handler_set(avrdude_message_handler_ostream, reinterpret_cast(&stderr)); + ::avrdude_message_handler_set(avrdude_message_handler_ostream, reinterpret_cast(&os)); const auto res = ::avrdude_main(static_cast(c_args.size()), c_args.data(), sys_config.c_str()); ::avrdude_message_handler_set(nullptr, nullptr); return res; } + } } -- cgit v1.2.3