From: Jonathan Chambers <joncham@gmail.com>
Date: Tue, 13 Mar 2007 20:00:05 +0000 (+0000)
Subject: 2007-03-13  Jonathan Chambers  <joncham@gmail.com>
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53ca10ca1b63b5e83ba84832ccff463d185d2929;p=gc

2007-03-13  Jonathan Chambers  <joncham@gmail.com>

	* *.vcproj:	Move to msvc directory.
	* *.bat:	Move to msvc directory.
	* libgc/misc.c: Use correct string type for GetModuleHandle.


svn path=/trunk/mono/; revision=74203
---

diff --git a/libgc.vcproj b/libgc.vcproj
deleted file mode 100644
index 1cf813da..00000000
--- a/libgc.vcproj
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libgc"
-	ProjectGUID="{EB56000B-C80B-4E8B-908D-D84D31B517D3}"
-	RootNamespace="libgc"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../msvc/lib/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="../msvc/obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\include\"
-				PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				DisableSpecificWarnings="4311;4312;4996;4005"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\libgc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../msvc/lib/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="../msvc/obj/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\include\"
-				PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;NDEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\libgc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\include\"
-				PreprocessorDefinitions="WIN64;_WIN64;GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				DisableSpecificWarnings="4311;4312;4996;4005"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\libgc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\include\"
-				PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_INSIDE_DLL;GC_GCJ_SUPPORT;WIN32;NDEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__;GC_BUILD;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\libgc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\allchblk.c"
-				>
-			</File>
-			<File
-				RelativePath=".\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\blacklst.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dbg_mlc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dyn_load.c"
-				>
-			</File>
-			<File
-				RelativePath=".\finalize.c"
-				>
-			</File>
-			<File
-				RelativePath=".\gcj_mlc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\headers.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mach_dep.c"
-				>
-			</File>
-			<File
-				RelativePath=".\malloc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mallocx.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mark.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mark_rts.c"
-				>
-			</File>
-			<File
-				RelativePath=".\misc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\new_hblk.c"
-				>
-			</File>
-			<File
-				RelativePath=".\obj_map.c"
-				>
-			</File>
-			<File
-				RelativePath=".\os_dep.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ptr_chck.c"
-				>
-			</File>
-			<File
-				RelativePath=".\reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath=".\stubborn.c"
-				>
-			</File>
-			<File
-				RelativePath=".\typd_mlc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\win32_threads.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\include\gc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\private\gc_hdrs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\private\gc_locks.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\gc_mark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\private\gc_pmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\private\gc_priv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\private\gcconfig.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/misc.c b/misc.c
index 52567b7d..be2555b8 100644
--- a/misc.c
+++ b/misc.c
@@ -477,7 +477,7 @@ void GC_init()
 #if defined(GC_WIN32_THREADS) && !defined(GC_PTHREADS)
     if (!GC_is_initialized) {
       BOOL (WINAPI *pfn) (LPCRITICAL_SECTION, DWORD) = NULL;
-      HMODULE hK32 = GetModuleHandle("kernel32.dll");
+      HMODULE hK32 = GetModuleHandle(_T("kernel32.dll"));
       if (hK32)
           (FARPROC) pfn = GetProcAddress(hK32,
 			  "InitializeCriticalSectionAndSpinCount");