diff options
Diffstat (limited to 'xs/src/avrdude/ser_win32.c')
| -rw-r--r-- | xs/src/avrdude/ser_win32.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xs/src/avrdude/ser_win32.c b/xs/src/avrdude/ser_win32.c index 20d085d13..4e1713128 100644 --- a/xs/src/avrdude/ser_win32.c +++ b/xs/src/avrdude/ser_win32.c @@ -246,10 +246,11 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp) newname = malloc(strlen("\\\\.\\") + strlen(port) + 1); if (newname == 0) { - avrdude_message(MSG_INFO, "%s: ser_open(): out of memory\n", - progname); - exit(1); - } + // avrdude_message(MSG_INFO, "%s: ser_open(): out of memory\n", + // progname); + // exit(1); + avrdude_oom("ser_open(): out of memory\n"); + } strcpy(newname, "\\\\.\\"); strcat(newname, port); @@ -311,8 +312,10 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp) static void ser_close(union filedescriptor *fd) { if (serial_over_ethernet) { +#ifdef HAVE_LIBWS2_32 closesocket(fd->ifd); WSACleanup(); +#endif } else { HANDLE hComPort=(HANDLE)fd->pfd; if (hComPort != INVALID_HANDLE_VALUE) |