crt/tlssup.c: Removed Windows 9X/Me mingwm10.dll support git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5168 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index e297c1e..a9062cc 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,7 @@ +2012-07-06 Ozkan Sezer <sezeroz@gmail.com> + + * crt/tlssup.c: Removed Windows 9X/Me mingwm10.dll support. + 2012-06-29 Ozkan Sezer <sezeroz@gmail.com> Merge from the trunk rev. 4808:
diff --git a/mingw-w64-crt/crt/tlssup.c b/mingw-w64-crt/crt/tlssup.c index 3a0e635..a46a119 100644 --- a/mingw-w64-crt/crt/tlssup.c +++ b/mingw-w64-crt/crt/tlssup.c
@@ -1,6 +1,6 @@ /** * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. + * This file is part of the mingw-w64 runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. * * Written by Kai Tietz <kai.tietz@onevision.com> @@ -20,9 +20,6 @@ #include <stdio.h> #include <memory.h> #include <malloc.h> -#ifndef _WIN64 -#include <stdlib.h> /* for _winmajor */ -#endif #ifndef __INTERNAL_FUNC_DEFINED #define __INTERNAL_FUNC_DEFINED @@ -76,16 +73,6 @@ extern int _CRT_MT; -#ifndef _WIN64 -#define MINGWM10_DLL "mingwm10.dll" -typedef int (*fMTRemoveKeyDtor)(DWORD key); -typedef int (*fMTKeyDtor)(DWORD key, void (*dtor)(void *)); -fMTRemoveKeyDtor __mingw_gMTRemoveKeyDtor; -fMTKeyDtor __mingw_gMTKeyDtor; -int __mingw_usemthread_dll; -static HANDLE __mingw_mthread_hdll; -#endif - BOOL WINAPI __dyn_tls_init (HANDLE, DWORD, LPVOID); BOOL WINAPI @@ -94,30 +81,6 @@ _PVFV *pfunc; uintptr_t ps; -#ifndef _WIN64 - if (_winmajor < 4) - { - __mingw_usemthread_dll = 1; - __mingw_mthread_hdll = LoadLibrary (MINGWM10_DLL); - if (__mingw_mthread_hdll != NULL) - { - __mingw_gMTRemoveKeyDtor = (fMTRemoveKeyDtor) GetProcAddress (__mingw_mthread_hdll, "__mingwthr_remove_key_dtor"); - __mingw_gMTKeyDtor = (fMTKeyDtor) GetProcAddress (__mingw_mthread_hdll, "__mingwthr_key_dtor"); - } - if (__mingw_mthread_hdll == NULL || !__mingw_gMTRemoveKeyDtor || !__mingw_gMTKeyDtor) - { - __mingw_gMTKeyDtor = NULL; - __mingw_gMTRemoveKeyDtor = NULL; - if (__mingw_mthread_hdll) - FreeLibrary (__mingw_mthread_hdll); - __mingw_mthread_hdll = NULL; - _CRT_MT = 0; - return TRUE; - } - _CRT_MT = 1; - return TRUE; - } -#endif /* We don't let us trick here. */ if (_CRT_MT != 2) _CRT_MT = 2;
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h index 9253394..b2b559f 100644 --- a/mingw-w64-crt/revstamp.h +++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@ /* Do not edit. Autogenerated. */ -#define __MINGW_W64_REV "5164" -#define __MINGW_W64_REV_STAMP "2012-07-04" +#define __MINGW_W64_REV "5168" +#define __MINGW_W64_REV_STAMP "2012-07-06"