From 2ffecd3acc9d00dab23657c3aa267489ba12f12c Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Tue, 18 Nov 2008 18:51:52 -0600
Subject: [PATCH] Fix VM compile on 32-bit Windows

---
 vm/main-windows-nt.c |  2 +-
 vm/os-windows.h      | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 vm/main-windows-nt.c

diff --git a/vm/main-windows-nt.c b/vm/main-windows-nt.c
old mode 100644
new mode 100755
index 95fd68549d..ef66651846
--- a/vm/main-windows-nt.c
+++ b/vm/main-windows-nt.c
@@ -15,7 +15,7 @@ int WINAPI WinMain(
 	szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
 	if(NULL == szArglist)
 	{
-		print_string("CommandLineToArgvW failed\n");
+		puts("CommandLineToArgvW failed");
 		return 1;
 	}
 
diff --git a/vm/os-windows.h b/vm/os-windows.h
index 2a56b03ef6..8d0f15648a 100755
--- a/vm/os-windows.h
+++ b/vm/os-windows.h
@@ -20,13 +20,14 @@ typedef wchar_t F_CHAR;
 #define STRNCMP wcsncmp
 #define STRDUP _wcsdup
 
-#define CELL_FORMAT "%Iu"
-#define CELL_HEX_FORMAT "%Ix"
-
-#ifdef FACTOR_64
+#ifdef WIN64
+        #define CELL_FORMAT "%Iu"
+        #define CELL_HEX_FORMAT "%Ix"
 	#define CELL_HEX_PAD_FORMAT "%016Ix"
 #else
-	#define CELL_HEX_PAD_FORMAT "%08Ix"
+        #define CELL_FORMAT "%lu"
+        #define CELL_HEX_FORMAT "%lx"
+	#define CELL_HEX_PAD_FORMAT "%08lx"
 #endif
 
 #define FIXNUM_FORMAT "%Id"
@@ -34,7 +35,7 @@ typedef wchar_t F_CHAR;
 #define OPEN_READ(path) _wfopen(path,L"rb")
 #define OPEN_WRITE(path) _wfopen(path,L"wb")
 
-#define print_native_string(string) wprintf(L"%s",arg)
+#define print_native_string(string) wprintf(L"%s",string)
 
 /* Difference between Jan 1 00:00:00 1601 and Jan 1 00:00:00 1970 */
 #define EPOCH_OFFSET 0x019db1ded53e8000LL