Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-26 10:49:21 +00:00
Code Issues Projects Releases Wiki Activity

missed commits

Browse Source
This commit is contained in:
Andrew Tonner 2017-01-18 04:51:34 -08:00
parent b74ae092c9
commit dc54a5eceb
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -140,3 +140,5 @@ SheepShaver/src/Windows/config.log
SheepShaver/src/kpx_cpu/src/cpu/jit/x86/codegen_x86.h
BasiliskII/src/Windows/x64/
SheepShaver/src/Windows/config.status
SheepShaver/src/Windows/obj/
SheepShaver/src/Windows/build_on_msys.cache.json

2
BasiliskII/src/Windows/ether_windows.cpp
View File

@ -39,6 +39,8 @@
#include "ether_windows.h"
#include "router/router.h"
#include "util_windows.h"
// somehow util_windows undefines min
#define min(x,y) ((x) < (y) ? (x) : (y))
#include "libslirp.h"
// Define to let the slirp library determine the right timeout for select()

10
BasiliskII/src/Windows/serial_windows.cpp
View File

@ -28,6 +28,8 @@
#include "main.h"
#include "util_windows.h"
// somehow util_windows undefines min
#define min(x,y) ((x) < (y) ? (x) : (y))
#include "macos_util.h"
#include "prefs.h"
#include "serial.h"
@ -310,12 +312,12 @@ open_error:
if (input_thread_active) {
TerminateThread(input_thread_active,0);
CloseHandle(input_signal);
input_thread_active = false;
input_thread_active = 0;
}
if (output_thread_active) {
TerminateThread(output_thread_active,0);
CloseHandle(output_signal);
output_thread_active = false;
output_thread_active = 0;
}
if(fd != INVALID_HANDLE_VALUE) {
CloseHandle(fd);
@ -674,13 +676,13 @@ int16 XSERDPort::close()
if (input_thread_active) {
quitting = true;
ReleaseSemaphore(input_signal,1,NULL);
input_thread_active = false;
input_thread_active = 0;
CloseHandle(input_signal);
}
if (output_thread_active) {
quitting = true;
ReleaseSemaphore(output_signal,1,NULL);
output_thread_active = false;
output_thread_active = 0;
// bugfix: was: CloseHandle(&output_signal);
CloseHandle(output_signal);
}