remove win32? and win64? words

diff --git a/core/alien/c-types/c-types.factor b/core/alien/c-types/c-types.factor
index ae99f9e6bf591741ad0a0ebf4bca751b04c51430..ca1a89b4aeebab38306aff05d3fc12540d1eb205 100755 (executable)
--- a/core/alien/c-types/c-types.factor
+++ b/core/alien/c-types/c-types.factor
@@ -388,6 +388,6 @@ M: long-long-type box-return ( type -- )
 
     [ string>u16-alien ] "ushort*" c-type set-c-type-prep
     
-    win64? "longlong" "long" ? "ptrdiff_t" typedef
+    os winnt? cpu x86.64? and "longlong" "long" ? "ptrdiff_t" typedef
     
 ] with-compilation-unit

diff --git a/core/system/system-docs.factor b/core/system/system-docs.factor
index 9124efcb8c098315c3c4013e1c312208a01ea412..9d25ee11388dabee68153408caf7b45585f722a5 100755 (executable)
--- a/core/system/system-docs.factor
+++ b/core/system/system-docs.factor
@@ -5,8 +5,6 @@ IN: system
 ARTICLE: "os" "System interface"
 "Operating system detection:"
 { $subsection os }
-{ $subsection win32? }
-{ $subsection win64? }
 "Processor detection:"
 { $subsection cpu }
 "Reading environment variables:"
@@ -86,14 +84,6 @@ HELP: set-os-envs
 
 { os-env os-envs set-os-envs } related-words
 
-HELP: win32?
-{ $values { "?" "a boolean" } }
-{ $description "Tests if Factor is running on 32-bit Windows." } ;
-
-HELP: win64?
-{ $values { "?" "a boolean" } }
-{ $description "Tests if Factor is running on 64-bit Windows." } ;
-
 HELP: image
 { $values { "path" "a pathname string" } }
 { $description "Outputs the pathname of the currently running Factor image." } ;

diff --git a/core/system/system.factor b/core/system/system.factor
index 00b3f87e9853e49125af4c3ffa8a1471c2df4804..98dc605acc967c2abbda96a8faadc6e963ae3732 100755 (executable)
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -64,14 +64,6 @@ PRIVATE>
 
 : vm ( -- path ) 14 getenv ;
 
-: win32? ( -- ? )
-    os winnt?
-    cell 4 = and ; foldable
-
-: win64? ( -- ? )
-    os winnt?
-    cell 8 = and ; foldable
-
 : embedded? ( -- ? ) 15 getenv ;
 
 : os-envs ( -- assoc )

diff --git a/extra/cairo/ffi/ffi.factor b/extra/cairo/ffi/ffi.factor
index dd4faf9f96f15858975caae42ce776eb26c941a6..200c85c92920fc9dcbd5780205708127b8f0d3cc 100644 (file)
--- a/extra/cairo/ffi/ffi.factor
+++ b/extra/cairo/ffi/ffi.factor
@@ -7,13 +7,11 @@
 !  - most of the matrix stuff
 !  - most of the query functions
 
-
 USING: alien alien.syntax combinators system ;
-
 IN: cairo.ffi
 
 << "cairo" {
-        { [ os win32? ] [ "libcairo-2.dll" ] }
+        { [ os winnt? ] [ "libcairo-2.dll" ] }
         ! { [ os macosx? ] [ "libcairo.dylib" ] }
         { [ os macosx? ] [ "/opt/local/lib/libcairo.dylib" ] }
         { [ os unix? ] [ "libcairo.so.2" ] }

diff --git a/extra/db/mysql/ffi/ffi.factor b/extra/db/mysql/ffi/ffi.factor
index 424cc7c754cc3798fe72edffea7a47b4f95a69c4..c047393c99978165815f361667639f7a55c89ba8 100644 (file)
--- a/extra/db/mysql/ffi/ffi.factor
+++ b/extra/db/mysql/ffi/ffi.factor
@@ -6,7 +6,7 @@ USING: alien alien.syntax combinators kernel system ;
 IN: db.mysql.ffi
 
 << "mysql" {
-    { [ os win32? ] [ "libmySQL.dll" "stdcall" ] }
+    { [ os winnt? ] [ "libmySQL.dll" "stdcall" ] }
     { [ os macosx? ] [ "libmysqlclient.14.dylib" "cdecl" ] }
     { [ os unix? ] [ "libmysqlclient.so.14" "cdecl" ] }
 } cond add-library >>

diff --git a/extra/db/postgresql/ffi/ffi.factor b/extra/db/postgresql/ffi/ffi.factor
index b6aee3dcce703b2c3b063f0fc2bac3f5b8426c83..7925989bf5879016150f0f3574064b205bdf6f0d 100755 (executable)
--- a/extra/db/postgresql/ffi/ffi.factor
+++ b/extra/db/postgresql/ffi/ffi.factor
@@ -5,7 +5,7 @@ USING: alien alien.syntax combinators system ;
 IN: db.postgresql.ffi
 
 << "postgresql" {
-    { [ os win32? ]  [ "libpq.dll" ] }
+    { [ os winnt? ]  [ "libpq.dll" ] }
     { [ os macosx? ] [ "/opt/local/lib/postgresql82/libpq.dylib" ] }
     { [ os unix?  ]  [ "libpq.so" ] }
 } cond "cdecl" add-library >>

diff --git a/extra/ogg/ogg.factor b/extra/ogg/ogg.factor
index 9a6997ce298019d6ec29a048f3516054ec392610..37dd30f7fdbb4762be6beb83b733f8e84e67f1d7 100644 (file)
--- a/extra/ogg/ogg.factor
+++ b/extra/ogg/ogg.factor
@@ -6,7 +6,7 @@ IN: ogg
 
 <<
 "ogg" {
-    { [ os win32? ]  [ "ogg.dll" ] }
+    { [ os winnt? ]  [ "ogg.dll" ] }
     { [ os macosx? ] [ "libogg.0.dylib" ] }
     { [ os unix? ]   [ "libogg.so" ] }
 } cond "cdecl" add-library

diff --git a/extra/ogg/theora/theora.factor b/extra/ogg/theora/theora.factor
index 12d2aa4efbde59092fc7f097a365f24bd2f7c7f5..3d73fb8820f750c0b94e956c1d40caba00164845 100644 (file)
--- a/extra/ogg/theora/theora.factor
+++ b/extra/ogg/theora/theora.factor
@@ -6,7 +6,7 @@ IN: ogg.theora
 
 <<
 "theora" {
-    { [ os win32? ]  [ "theora.dll" ] }
+    { [ os winnt? ]  [ "theora.dll" ] }
     { [ os macosx? ] [ "libtheora.0.dylib" ] }
     { [ os unix? ]   [ "libtheora.so" ] }
 } cond "cdecl" add-library

diff --git a/extra/ogg/vorbis/vorbis.factor b/extra/ogg/vorbis/vorbis.factor
index 6dbea7869aa7118a33a6c0f3ce91a50fd8cf1e1b..5712272ebc615a9387d436f69a4469b21039f95e 100644 (file)
--- a/extra/ogg/vorbis/vorbis.factor
+++ b/extra/ogg/vorbis/vorbis.factor
@@ -6,7 +6,7 @@ IN: ogg.vorbis
 
 <<
 "vorbis" {
-    { [ os win32? ]  [ "vorbis.dll" ] }
+    { [ os winnt? ]  [ "vorbis.dll" ] }
     { [ os macosx? ] [ "libvorbis.0.dylib" ] }
     { [ os unix? ]   [ "libvorbis.so" ] }
 } cond "cdecl" add-library 

diff --git a/extra/openal/backend/backend.factor b/extra/openal/backend/backend.factor
index edbb227fcc19cc0a74ca02a0429e422fa793a121..41069dcddf14b87ea6d588228eb1d1b873740365 100644 (file)
--- a/extra/openal/backend/backend.factor
+++ b/extra/openal/backend/backend.factor
@@ -1,8 +1,4 @@
-USING: namespaces ;
+USING: namespaces system ;
 IN: openal.backend
 
-SYMBOL: openal-backend
-HOOK: load-wav-file openal-backend ( filename -- format data size frequency )
-
-TUPLE: other-openal-backend ;
-T{ other-openal-backend } openal-backend set-global
+HOOK: load-wav-file os ( filename -- format data size frequency )

diff --git a/extra/openal/macosx/macosx.factor b/extra/openal/macosx/macosx.factor
index 7828021f5387662ab165dd0ca9f3503a82756471..c03ad5693ceb2515b3d05034a26094727c14a9aa 100644 (file)
--- a/extra/openal/macosx/macosx.factor
+++ b/extra/openal/macosx/macosx.factor
@@ -1,18 +1,14 @@
-! Copyright (C) 2007 Chris Double.\r
-! See http://factorcode.org/license.txt for BSD license.\r
-!\r
-IN: openal.macosx\r
-USING: alien.c-types kernel alien alien.syntax shuffle\r
-combinators.lib openal.backend namespaces ;\r
-\r
-TUPLE: macosx-openal-backend ;\r
-LIBRARY: alut\r
-\r
-T{ macosx-openal-backend } openal-backend set-global\r
-\r
-FUNCTION: void alutLoadWAVFile ( ALbyte* fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency ) ;\r
-\r
-M: macosx-openal-backend load-wav-file ( path -- format data size frequency )\r
-  0 <int> f <void*> 0 <int> 0 <int>\r
-  [ alutLoadWAVFile ] 4keep\r
-  >r >r >r *int r> *void* r> *int r> *int ;\r
+! Copyright (C) 2007 Chris Double.
+! See http://factorcode.org/license.txt for BSD license.
+USING: alien.c-types kernel alien alien.syntax shuffle
+combinators.lib openal.backend namespaces ;
+IN: openal.macosx
+
+LIBRARY: alut
+
+FUNCTION: void alutLoadWAVFile ( ALbyte* fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency ) ;
+
+M: macosx load-wav-file ( path -- format data size frequency )
+  0 <int> f <void*> 0 <int> 0 <int>
+  [ alutLoadWAVFile ] 4keep
+  >r >r >r *int r> *void* r> *int r> *int ;

diff --git a/extra/openal/openal.factor b/extra/openal/openal.factor
index e37988a8ce3918607c4fc22e7e3f9e9e9f615c3f..ff67a30ea34ad67b3621a25f37a9f28128f75a00 100644 (file)
--- a/extra/openal/openal.factor
+++ b/extra/openal/openal.factor
@@ -1,20 +1,23 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-!
-IN: openal
 USING: kernel alien system combinators alien.syntax namespaces
        alien.c-types sequences vocabs.loader shuffle combinators.lib
        openal.backend ;
+IN: openal
 
 << "alut" {
-        { [ os win32? ]  [ "alut.dll" ] }
-        { [ os macosx? ] [ "/System/Library/Frameworks/OpenAL.framework/OpenAL" ] }
+        { [ os windows? ]  [ "alut.dll" ] }
+        { [ os macosx? ] [
+            "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+        ] }
         { [ os unix?  ]  [ "libalut.so" ] }
     } cond "cdecl" add-library >>
 
 << "openal" {
-        { [ os win32? ]  [ "OpenAL32.dll" ] }
-        { [ os macosx? ] [ "/System/Library/Frameworks/OpenAL.framework/OpenAL" ] }
+        { [ os windows? ]  [ "OpenAL32.dll" ] }
+        { [ os macosx? ] [
+            "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+        ] }
         { [ os unix?  ]  [ "libopenal.so" ] }
     } cond "cdecl" add-library >>
 
@@ -290,4 +293,3 @@ os macosx? "openal.macosx" "openal.other" ? require
 
 : source-playing? ( source -- bool )
   AL_SOURCE_STATE get-source-param AL_PLAYING = ;
-

diff --git a/extra/openal/other/other.factor b/extra/openal/other/other.factor
index e32b00797322d7d6c551fb871e3d8435cd79f04d..d0429fb3c3bd46b1c43913d3c6307ef3fd0d2c17 100644 (file)
--- a/extra/openal/other/other.factor
+++ b/extra/openal/other/other.factor
@@ -1,14 +1,14 @@
-! Copyright (C) 2007 Chris Double.\r
-! See http://factorcode.org/license.txt for BSD license.\r
-!\r
-IN: openal.other\r
-USING: openal.backend alien.c-types kernel alien alien.syntax shuffle combinators.lib ;\r
-\r
-LIBRARY: alut\r
-\r
-FUNCTION: void alutLoadWAVFile ( ALbyte* fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency, ALboolean* looping ) ;\r
-\r
-M: other-openal-backend load-wav-file ( filename -- format data size frequency )\r
-  0 <int> f <void*> 0 <int> 0 <int>\r
-  [ 0 <char> alutLoadWAVFile ] 4keep\r
-  >r >r >r *int r> *void* r> *int r> *int ;\r
+! Copyright (C) 2007 Chris Double.
+! See http://factorcode.org/license.txt for BSD license.
+USING: openal.backend alien.c-types kernel alien alien.syntax
+shuffle combinators.lib ;
+IN: openal.other
+
+LIBRARY: alut
+
+FUNCTION: void alutLoadWAVFile ( ALbyte* fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency, ALboolean* looping ) ;
+
+M: object load-wav-file ( filename -- format data size frequency )
+  0 <int> f <void*> 0 <int> 0 <int>
+  [ 0 <char> alutLoadWAVFile ] 4keep
+  >r >r >r *int r> *void* r> *int r> *int ;

diff --git a/extra/openssl/libcrypto/libcrypto.factor b/extra/openssl/libcrypto/libcrypto.factor
index a68cda34ea005ac9a777ff8716f706b2569d41e8..312c7b04b30e0a2c9b57ba4710c4b6953e10d4cc 100755 (executable)
--- a/extra/openssl/libcrypto/libcrypto.factor
+++ b/extra/openssl/libcrypto/libcrypto.factor
@@ -11,7 +11,7 @@ IN: openssl.libcrypto
 
 <<
 "libcrypto" {
-    { [ os win32? ]  [ "libeay32.dll" "cdecl" ] }
+    { [ os winnt? ]  [ "libeay32.dll" "cdecl" ] }
     { [ os macosx? ] [ "libcrypto.dylib" "cdecl" ] }
     { [ os unix? ]   [ "libcrypto.so" "cdecl" ] }
 } cond add-library

diff --git a/extra/openssl/libssl/libssl.factor b/extra/openssl/libssl/libssl.factor
index 098e1f93829d6af2e02d02039e9a23e550b03b5e..0f2e7b3184e8efd69d42d7345c498ab7841a681f 100755 (executable)
--- a/extra/openssl/libssl/libssl.factor
+++ b/extra/openssl/libssl/libssl.factor
@@ -10,7 +10,7 @@ USING: alien alien.syntax combinators kernel system ;
 IN: openssl.libssl
 
 << "libssl" {
-    { [ os win32? ]  [ "ssleay32.dll" "cdecl" ] }
+    { [ os winnt? ]  [ "ssleay32.dll" "cdecl" ] }
     { [ os macosx? ] [ "libssl.dylib" "cdecl" ] }
     { [ os unix? ]   [ "libssl.so" "cdecl" ] }
 } cond add-library >>

diff --git a/extra/oracle/liboci/liboci.factor b/extra/oracle/liboci/liboci.factor
index 6a482b9f56d6a3a11f97598504f8a4e64c738c22..7af69a97bb0821640ca76b0dff364e0797840b01 100644 (file)
--- a/extra/oracle/liboci/liboci.factor
+++ b/extra/oracle/liboci/liboci.factor
@@ -12,7 +12,7 @@ USING: alien alien.syntax combinators kernel system ;
 IN: oracle.liboci
 
 "oci" {
-    { [ os win32? ] [ "oci.dll" "stdcall" ] }
+    { [ os winnt? ] [ "oci.dll" "stdcall" ] }
     { [ os macosx? ] [ "$DYLD_LIBRARY_PATH/libclntsh.dylib" "cdecl" ] }
     { [ os unix? ] [ "$DYLD_LIBRARY_PATH/libclntsh.so.10.1" "cdecl" ] }
 } cond add-library