From 5d09d2b6c4d0e8a95ad9f80b6fa6f5e69188575e Mon Sep 17 00:00:00 2001 From: nigel <> Date: Thu, 29 Dec 2005 13:40:25 +0000 Subject: [PATCH] Small hack for clean exits on Nigel's OS X port --- BasiliskII/src/Unix/ether_unix.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BasiliskII/src/Unix/ether_unix.cpp b/BasiliskII/src/Unix/ether_unix.cpp index 3c29c5fc..d5b32501 100644 --- a/BasiliskII/src/Unix/ether_unix.cpp +++ b/BasiliskII/src/Unix/ether_unix.cpp @@ -167,7 +167,12 @@ static void stop_thread(void) #ifdef HAVE_PTHREAD_CANCEL pthread_cancel(ether_thread); #endif +#ifdef AQUA + // This call, which waits for ether_thread to terminate, + // never returns when used in Nigel's OS X port. +#else pthread_join(ether_thread, NULL); +#endif sem_destroy(&int_ack); thread_active = false; }