From c0c08985c5c46c877ebefcceb034751e6143bd94 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 4 Feb 2008 17:10:49 -0600
Subject: [PATCH] make hardware-info load on windows

---
 extra/hardware-info/hardware-info.factor      |  7 +++---
 .../windows/backend/backend.factor            |  6 -----
 extra/hardware-info/windows/ce/ce.factor      |  4 ++--
 extra/hardware-info/windows/nt/nt.factor      | 24 +++++++++----------
 extra/hardware-info/windows/windows.factor    |  7 +++---
 5 files changed, 21 insertions(+), 27 deletions(-)
 delete mode 100644 extra/hardware-info/windows/backend/backend.factor

diff --git a/extra/hardware-info/hardware-info.factor b/extra/hardware-info/hardware-info.factor
index 0515646a5f..69b8678749 100755
--- a/extra/hardware-info/hardware-info.factor
+++ b/extra/hardware-info/hardware-info.factor
@@ -1,12 +1,13 @@
-USING: alien.syntax kernel math prettyprint system
-combinators vocabs.loader hardware-info.backend ;
+USING: alien.syntax kernel math prettyprint
+combinators vocabs.loader hardware-info.backend system ;
 IN: hardware-info
 
 : kb. ( x -- ) 10 2^ /f . ;
 : megs. ( x -- ) 20 2^ /f . ;
 : gigs. ( x -- ) 30 2^ /f . ;
 
-<< {
+<<
+{
     { [ windows? ] [ "hardware-info.windows" ] }
     { [ linux? ] [ "hardware-info.linux" ] }
     { [ macosx? ] [ "hardware-info.macosx" ] }
diff --git a/extra/hardware-info/windows/backend/backend.factor b/extra/hardware-info/windows/backend/backend.factor
deleted file mode 100644
index 516603c441..0000000000
--- a/extra/hardware-info/windows/backend/backend.factor
+++ /dev/null
@@ -1,6 +0,0 @@
-IN: hardware-info.windows.backend
-
-TUPLE: wince ;
-TUPLE: winnt ;
-UNION: windows wince winnt ;
-
diff --git a/extra/hardware-info/windows/ce/ce.factor b/extra/hardware-info/windows/ce/ce.factor
index 1592bad14c..8923d86b03 100755
--- a/extra/hardware-info/windows/ce/ce.factor
+++ b/extra/hardware-info/windows/ce/ce.factor
@@ -2,8 +2,8 @@ USING: alien.c-types hardware-info kernel math namespaces
 windows windows.kernel32 hardware-info.backend ;
 IN: hardware-info.windows.ce
 
-TUPLE: wince ;
-T{ wince } os set-global
+TUPLE: wince-os ;
+T{ wince-os } os set-global
 
 : memory-status ( -- MEMORYSTATUS )
     "MEMORYSTATUS" <c-object>
diff --git a/extra/hardware-info/windows/nt/nt.factor b/extra/hardware-info/windows/nt/nt.factor
index 827b32c2f2..8bdb75fe6a 100755
--- a/extra/hardware-info/windows/nt/nt.factor
+++ b/extra/hardware-info/windows/nt/nt.factor
@@ -1,16 +1,15 @@
-USING: alien alien.c-types hardware-info.windows.backend
+USING: alien alien.c-types
 kernel libc math namespaces hardware-info.backend
 windows windows.advapi32 windows.kernel32 ;
 IN: hardware-info.windows.nt
 
-TUPLE: winnt ;
-
-T{ winnt } os set-global
+TUPLE: winnt-os ;
+T{ winnt-os } os set-global
 
 : system-info ( -- SYSTEM_INFO )
     "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;
 
-M: winnt cpus ( -- n )
+M: winnt-os cpus ( -- n )
     system-info SYSTEM_INFO-dwNumberOfProcessors ;
 
 : memory-status ( -- MEMORYSTATUSEX )
@@ -18,25 +17,25 @@ M: winnt cpus ( -- n )
     "MEMORYSTATUSEX" heap-size over set-MEMORYSTATUSEX-dwLength
     [ GlobalMemoryStatusEx ] keep swap zero? [ win32-error ] when ;
 
-M: winnt memory-load ( -- n )
+M: winnt-os memory-load ( -- n )
     memory-status MEMORYSTATUSEX-dwMemoryLoad ;
 
-M: winnt physical-mem ( -- n )
+M: winnt-os physical-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalPhys ;
 
-M: winnt available-mem ( -- n )
+M: winnt-os available-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailPhys ;
 
-M: winnt total-page-file ( -- n )
+M: winnt-os total-page-file ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalPageFile ;
 
-M: winnt available-page-file ( -- n )
+M: winnt-os available-page-file ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailPageFile ;
 
-M: winnt total-virtual-mem ( -- n )
+M: winnt-os total-virtual-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalVirtual ;
 
-M: winnt available-virtual-mem ( -- n )
+M: winnt-os available-virtual-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailVirtual ;
 
 : computer-name ( -- string )
@@ -54,4 +53,3 @@ M: winnt available-virtual-mem ( -- n )
     ] [
         [ alien>u16-string ] keep free
     ] if ;
-
diff --git a/extra/hardware-info/windows/windows.factor b/extra/hardware-info/windows/windows.factor
index 67d13fc50f..f3a1eb33f5 100755
--- a/extra/hardware-info/windows/windows.factor
+++ b/extra/hardware-info/windows/windows.factor
@@ -1,7 +1,7 @@
 USING: alien alien.c-types kernel libc math namespaces
 windows windows.kernel32 windows.advapi32
-hardware-info.windows.backend
-words combinators vocabs.loader hardware-info.backend ;
+words combinators vocabs.loader hardware-info.backend
+system ;
 IN: hardware-info.windows
 
 : system-info ( -- SYSTEM_INFO )
@@ -63,7 +63,8 @@ IN: hardware-info.windows
 : system-windows-directory ( -- str )
     \ GetSystemWindowsDirectory get-directory ;
 
+<<
 {
     { [ wince? ] [ "hardware-info.windows.ce" ] }
     { [ winnt? ] [ "hardware-info.windows.nt" ] }
-} cond [ require ] when*
+} cond [ require ] when* >>