Merge git://factorcode.org/git/factor

Conflicts:

	extra/hardware-info/windows/nt/nt.factor
	extra/hardware-info/windows/windows.factor

diff --cc extra/hardware-info/windows/nt/nt.factor
index 8a58e5c168351cb0b9cb48095295213582571bee,2003e689a79c51cdd0d12970a2dc6f1846edd08b..827b32c2f2e01aa875f1fb62dc1d3fbfaa0057e9
mode 100644,100755..100755
--- 1/extra/hardware-info/windows/nt/nt.factor
--- 2/extra/hardware-info/windows/nt/nt.factor
+++ b/extra/hardware-info/windows/nt/nt.factor
@@@ -1,10 -1,18 +1,18 @@@
 -USING: alien alien.c-types kernel libc math namespaces
 -hardware-info.backend windows windows.advapi32 windows.kernel32
 -;
 +USING: alien alien.c-types hardware-info.windows.backend
 +kernel libc math namespaces hardware-info.backend
 +windows windows.advapi32 windows.kernel32 ;
  IN: hardware-info.windows.nt
  
+ TUPLE: winnt ;
+ 
  T{ winnt } os set-global
  
+ : system-info ( -- SYSTEM_INFO )
+     "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;
+ 
+ M: winnt cpus ( -- n )
+     system-info SYSTEM_INFO-dwNumberOfProcessors ;
+ 
  : memory-status ( -- MEMORYSTATUSEX )
      "MEMORYSTATUSEX" <c-object>
      "MEMORYSTATUSEX" heap-size over set-MEMORYSTATUSEX-dwLength

diff --cc extra/hardware-info/windows/windows.factor
index caf859c35e505abc58f3fdf8f16bdb509938d91b,7876a890b6571bf08c689fc6ade8ed8ecac86140..67d13fc50f84e8d8f2f6a2483e96c6aac6b91a82
--- 1/extra/hardware-info/windows/windows.factor
--- 2/extra/hardware-info/windows/windows.factor
+++ b/extra/hardware-info/windows/windows.factor
@@@ -1,11 -1,9 +1,9 @@@
  USING: alien alien.c-types kernel libc math namespaces
  windows windows.kernel32 windows.advapi32
 -words combinators vocabs.loader hardware-info.backend
 -system ;
 +hardware-info.windows.backend
 +words combinators vocabs.loader hardware-info.backend ;
  IN: hardware-info.windows
  
- USE: system
- 
  : system-info ( -- SYSTEM_INFO )
      "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;