From d48dffcfa023e85f1496a8312661c870c1815187 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Tue, 18 Aug 2009 20:22:11 +0100
Subject: [PATCH] moved os-windows-nt functions into the vm

---
 vm/os-windows-nt.cpp | 14 --------------
 vm/os-windows-nt.hpp |  2 --
 vm/vm.hpp            | 10 ++--------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/vm/os-windows-nt.cpp b/vm/os-windows-nt.cpp
index 8a8b2132ad..26781ee4f9 100755
--- a/vm/os-windows-nt.cpp
+++ b/vm/os-windows-nt.cpp
@@ -11,11 +11,6 @@ s64 factorvm::current_micros()
 		- EPOCH_OFFSET) / 10;
 }
 
-s64 current_micros()
-{
-	return vm->current_micros();
-}
-
 FACTOR_STDCALL LONG exception_handler(PEXCEPTION_POINTERS pe)
 {
 	PEXCEPTION_RECORD e = (PEXCEPTION_RECORD)pe->ExceptionRecord;
@@ -71,17 +66,8 @@ void factorvm::c_to_factor_toplevel(cell quot)
 	RemoveVectoredExceptionHandler((void *)exception_handler);
 }
 
-void c_to_factor_toplevel(cell quot)
-{
-	return vm->c_to_factor_toplevel(quot);
-}
-
 void factorvm::open_console()
 {
 }
 
-void open_console()
-{
-}
-
 }
diff --git a/vm/os-windows-nt.hpp b/vm/os-windows-nt.hpp
index 088103bb5b..c083844ae0 100755
--- a/vm/os-windows-nt.hpp
+++ b/vm/os-windows-nt.hpp
@@ -19,9 +19,7 @@ typedef char symbol_char;
 
 #define FACTOR_STDCALL __attribute__((stdcall))
 
-void c_to_factor_toplevel(cell quot);
 FACTOR_STDCALL LONG exception_handler(PEXCEPTION_POINTERS pe);
-void open_console();
 
 // SSE traps raise these exception codes, which are defined in internal NT headers
 // but not winbase.h
diff --git a/vm/vm.hpp b/vm/vm.hpp
index fa4c365da6..9af0c5c8f9 100644
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -664,18 +664,12 @@ struct factorvm {
 	void windows_image_path(vm_char *full_path, vm_char *temp_path, unsigned int length);
 	bool windows_stat(vm_char *path);
 
-    #if defined(WINCE)
-    #else   /* WINNT */
+   #if defined(WINNT)
 	s64 current_micros();
 	void c_to_factor_toplevel(cell quot);
 	void open_console();
  	// next method here:
-    #endif
-
-	
-    #ifdef FACTOR_X86	
-    #endif
-
+   #endif
   #endif
 
 };