From f0f76cd7ad1c7eb74c8af91f30486cd8987230a0 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 21 Jan 2006 20:48:17 +0000
Subject: [PATCH] Remove nigel's hack, I am confident the problem was MacOS X
 implementation of poll() that was not a cancellation point, which I fixed
 (OSX/Intel 10.4.4)

---
 BasiliskII/src/Unix/ether_unix.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/BasiliskII/src/Unix/ether_unix.cpp b/BasiliskII/src/Unix/ether_unix.cpp
index 8c95c8a5..eaa24952 100644
--- a/BasiliskII/src/Unix/ether_unix.cpp
+++ b/BasiliskII/src/Unix/ether_unix.cpp
@@ -180,12 +180,7 @@ 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;
 	}