X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fcoree.c;h=6c7ff4a1f27d3e9370c05d760f5fdebfc867b2ad;hb=aa3de31b70d1c5826d67147696423cdd9c334d41;hp=9e48a3fe07749222d678cbc693ef0a21672a5b0b;hpb=795b738e43c346ffb1e183c2c3184c3512b74cca;p=mono.git

diff --git a/mono/metadata/coree.c b/mono/metadata/coree.c
index 9e48a3fe077..6c7ff4a1f27 100644
--- a/mono/metadata/coree.c
+++ b/mono/metadata/coree.c
@@ -11,12 +11,6 @@
 
 #ifdef HOST_WIN32
 
-#if _WIN32_WINNT < 0x0501
-/* Required for ACTCTX. */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif /* _WIN32_WINNT < 0x0501 */
-
 #include <string.h>
 #include <glib.h>
 #include <mono/io-layer/io-layer.h>
@@ -226,10 +220,12 @@ STDAPI _CorValidateImage(PVOID *ImageBase, LPCWSTR FileName)
 {
 	IMAGE_DOS_HEADER* DosHeader;
 	IMAGE_NT_HEADERS32* NtHeaders32;
-	IMAGE_NT_HEADERS64* NtHeaders64;
 	IMAGE_DATA_DIRECTORY* CliHeaderDir;
+#ifdef _WIN64
+	IMAGE_NT_HEADERS64* NtHeaders64;
 	MonoCLIHeader* CliHeader;
 	DWORD SizeOfHeaders;
+#endif
 	DWORD* Address;
 	DWORD OldProtect;
 
@@ -410,7 +406,9 @@ HMODULE WINAPI MonoLoadImage(LPCWSTR FileName)
 	HANDLE MapHandle;
 	IMAGE_DOS_HEADER* DosHeader;
 	IMAGE_NT_HEADERS32* NtHeaders32;
+#ifdef _WIN64
 	IMAGE_NT_HEADERS64* NtHeaders64;
+#endif
 	HMODULE ModuleHandle;
 
 	FileHandle = CreateFile(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
@@ -458,7 +456,9 @@ InvalidImageFormat:
 		goto UnmapView;
 	}
 
+#ifdef _WIN64
 ValidImage:
+#endif
 	UnmapViewOfFile(DosHeader);
 	CloseHandle(MapHandle);