From: Slava Pestov Date: Tue, 12 May 2009 09:19:22 +0000 (-0500) Subject: Move wchar_t* typedef from alien.arrays to windows.types since that's the only place... X-Git-Tag: 0.97~6284 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=aa0e9546337919bca4619415a22151dea4a387d0 Move wchar_t* typedef from alien.arrays to windows.types since that's the only place that uses it. Reduces deployed image size since io.encodings.utf16 not loaded on Unix --- diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor index 15e67bf0fe..e4a0e4dcf0 100755 --- a/basis/alien/arrays/arrays.factor +++ b/basis/alien/arrays/arrays.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.strings alien.c-types alien.accessors alien.structs arrays words sequences math kernel namespaces fry libc cpu.architecture -io.encodings.utf8 io.encodings.utf16n ; +io.encodings.utf8 ; IN: alien.arrays UNION: value-type array struct-type ; @@ -95,5 +95,4 @@ M: string-type c-type-setter { "char*" utf8 } "char*" typedef "char*" "uchar*" typedef -{ "char*" utf16n } "wchar_t*" typedef diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index 062196c3f8..b99e7ffe6f 100755 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2005, 2006 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.c-types alien.syntax namespaces kernel words -sequences math math.bitwise math.vectors colors ; +sequences math math.bitwise math.vectors colors +io.encodings.utf16n ; IN: windows.types TYPEDEF: char CHAR @@ -68,6 +69,8 @@ TYPEDEF: ulonglong ULARGE_INTEGER TYPEDEF: LARGE_INTEGER* PLARGE_INTEGER TYPEDEF: ULARGE_INTEGER* PULARGE_INTEGER +<< { "char*" utf16n } "wchar_t*" typedef >> + TYPEDEF: wchar_t* LPCSTR TYPEDEF: wchar_t* LPWSTR TYPEDEF: WCHAR TCHAR