Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

This commit is contained in:
Enrico Turri 2018-07-27 15:19:42 +02:00
commit e1a13e9f08

View File

@ -311,8 +311,10 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp)
static void ser_close(union filedescriptor *fd) static void ser_close(union filedescriptor *fd)
{ {
if (serial_over_ethernet) { if (serial_over_ethernet) {
#ifdef HAVE_LIBWS2_32
closesocket(fd->ifd); closesocket(fd->ifd);
WSACleanup(); WSACleanup();
#endif
} else { } else {
HANDLE hComPort=(HANDLE)fd->pfd; HANDLE hComPort=(HANDLE)fd->pfd;
if (hComPort != INVALID_HANDLE_VALUE) if (hComPort != INVALID_HANDLE_VALUE)