Mon Jan 4 11:23:40 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>bossom-merge-99-01-04bossom-merge-98-12-08

	* all: No code changes, just cleanup.
	- remove #if 0 /* Pre Bossom */ enclosed code.
	- Remove some redundant #includes.
	* pthread.h: Update implemented/unimplemented routines list.
	* Tag the bossom merge branch getting ready to merge back to main
	trunk.

1 files changed, 0 insertions, 76 deletions

diff --git a/dll.c b/dll.c
index c44d0df..dc1788f 100644
--- a/dll.c
+++ b/dll.c
@@ -5,7 +5,6 @@
  * This translation unit implements DLL initialisation.
  */
 
-#include <windows.h>
 #include <malloc.h>
 #include "pthread.h"
 #include "implement.h"
@@ -102,78 +101,3 @@ DllMain (
   return (result);
 
 }				/* DllMain */
-
-
-
-#if 0 /* Pre Bossom */
-
-/* We use the DLL entry point function to set up per thread storage
-   specifically to hold the threads own thread ID.
-
-   The thread ID is stored by _pthread_start_call().
-
-   The thread ID is retrieved by pthread_self().
-
- */
-
-/* Global index for TLS data. */
-DWORD _pthread_threadID_TlsIndex;
-
-/* Global index for thread TSD key array. */
-DWORD _pthread_TSD_keys_TlsIndex;
-
-
-/* Function pointer to TryEnterCriticalSection if it exists; otherwise NULL */
-BOOL (WINAPI *_pthread_try_enter_critical_section)(LPCRITICAL_SECTION) = NULL;
-
-/* Handle to kernel32.dll */
-static HINSTANCE _pthread_h_kernel32;
-
-BOOL WINAPI PthreadsEntryPoint(HINSTANCE dllHandle,
-			  DWORD reason,
-			  LPVOID situation)
-{
-  
-
-  switch (reason)
-    {
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-      break;
-
-    case DLL_PROCESS_ATTACH:
-      /* Set up per thread thread ID storage. */
-      _pthread_threadID_TlsIndex = TlsAlloc();
-
-      if (_pthread_threadID_TlsIndex == 0xFFFFFFFF)
-	{
-	  return FALSE;
-	}
-
-      /* Set up per thread TSD key array pointer. */
-      _pthread_TSD_keys_TlsIndex = TlsAlloc();
-
-      if (_pthread_TSD_keys_TlsIndex == 0xFFFFFFFF)
-	{
-	  return FALSE;
-	}
-
-      /* Load KERNEL32 and try to get address of TryEnterCriticalSection */
-      _pthread_h_kernel32 = LoadLibrary(TEXT("KERNEL32.DLL"));
-      _pthread_try_enter_critical_section = (void *) GetProcAddress(_pthread_h_kernel32, "TryEnterCriticalSection");
-      break;
-
-    case DLL_PROCESS_DETACH:
-      (void) TlsFree(_pthread_TSD_keys_TlsIndex);
-      (void) TlsFree(_pthread_threadID_TlsIndex);
-      (void) FreeLibrary(_pthread_h_kernel32);
-      break;
-
-    default:
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-#endif /* Pre Bossom */