GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 12:15:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

One more merge conflict resolved

Browse Source
This commit is contained in:
bubnikv 2019-09-20 16:52:42 +02:00
parent ac48c9518c
commit 115b86a0ec
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/GCodeSender.cpp
View File

@ -7,7 +7,6 @@
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/asio/serial_port_service.hpp>
#if defined(__APPLE__) || defined(__OpenBSD__) #if defined(__APPLE__) || defined(__OpenBSD__)
#include <termios.h> #include <termios.h>
@ -550,7 +549,7 @@ void
GCodeSender::set_DTR(bool on) GCodeSender::set_DTR(bool on)
{ {
#if defined(_WIN32) && !defined(__SYMBIAN32__) #if defined(_WIN32) && !defined(__SYMBIAN32__)
boost::asio::serial_port::native_handle_type handle = this->serial.native_handle(); boost::asio::serial_port_service::native_handle_type handle = this->serial.native_handle();
if (on) if (on)
EscapeCommFunction(handle, SETDTR); EscapeCommFunction(handle, SETDTR);
else else

1
src/libslic3r/GCodeSender.hpp
View File

@ -5,7 +5,6 @@
#include <queue> #include <queue>
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/core/noncopyable.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>