steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-11-17 21:46:54 -06:00
parent b3e63a2b1a 28f54b7fac
commit 983a42bcde
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/locals/locals.factor
View File

@ -229,6 +229,8 @@ M: tuple rewrite-element
M: local rewrite-element , ; M: local rewrite-element , ;
M: local-reader rewrite-element , ;
M: word rewrite-element literalize , ; M: word rewrite-element literalize , ;
M: object rewrite-element , ; M: object rewrite-element , ;

4
extra/hardware-info/windows/windows.factor
View File

@ -18,7 +18,7 @@ IN: hardware-info.windows
: processor-architecture ( -- n ) : processor-architecture ( -- n )
system-info SYSTEM_INFO-dwOemId HEX: ffff0000 bitand ; system-info SYSTEM_INFO-dwOemId HEX: ffff0000 bitand ;
: os-version : os-version ( -- os-version )
"OSVERSIONINFO" <c-object> "OSVERSIONINFO" <c-object>
"OSVERSIONINFO" heap-size over set-OSVERSIONINFO-dwOSVersionInfoSize "OSVERSIONINFO" heap-size over set-OSVERSIONINFO-dwOSVersionInfoSize
[ GetVersionEx ] keep swap zero? [ win32-error ] when ; [ GetVersionEx ] keep swap zero? [ win32-error ] when ;
@ -67,4 +67,4 @@ IN: hardware-info.windows
{ {
{ [ os wince? ] [ "hardware-info.windows.ce" ] } { [ os wince? ] [ "hardware-info.windows.ce" ] }
{ [ os winnt? ] [ "hardware-info.windows.nt" ] } { [ os winnt? ] [ "hardware-info.windows.nt" ] }
} cond [ require ] when* >> } cond require >>