From 5214923a35f97e7af3476b67522b3a5dae00640d Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 3 Dec 2008 09:51:42 -0800 Subject: [PATCH 1/3] fix serialization of t in json.writer --- basis/json/writer/writer.factor | 3 +++ 1 file changed, 3 insertions(+) diff --git a/basis/json/writer/writer.factor b/basis/json/writer/writer.factor index cbcf426545..a7efe7ad0f 100644 --- a/basis/json/writer/writer.factor +++ b/basis/json/writer/writer.factor @@ -12,6 +12,9 @@ GENERIC: json-print ( obj -- ) #! Returns a string representing the factor object in JSON format [ json-print ] with-string-writer ; +M: t json-print ( f -- ) + drop "true" write ; + M: f json-print ( f -- ) drop "false" write ; From 350a6cb6b0f912786c9acf65ef0203b17b73d54a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 3 Dec 2008 11:36:02 -0800 Subject: [PATCH 2/3] Looks like someone beat me to the punch on json.writer fix --- basis/json/writer/writer.factor | 3 --- 1 file changed, 3 deletions(-) diff --git a/basis/json/writer/writer.factor b/basis/json/writer/writer.factor index 79c7542dbb..e374919039 100644 --- a/basis/json/writer/writer.factor +++ b/basis/json/writer/writer.factor @@ -12,9 +12,6 @@ GENERIC: json-print ( obj -- ) #! Returns a string representing the factor object in JSON format [ json-print ] with-string-writer ; -M: t json-print ( f -- ) - drop "true" write ; - M: f json-print ( f -- ) drop "false" write ; From d4071b08e4a05bc92d5f15e8d5cc91aa59dca54a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 3 Dec 2008 11:38:38 -0800 Subject: [PATCH 3/3] fix GUID struct field types to be LP64-proof --- basis/windows/kernel32/kernel32.factor | 8 ++++---- basis/windows/types/types.factor | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor index 96301dbbe4..7d6f0ab5f2 100644 --- a/basis/windows/kernel32/kernel32.factor +++ b/basis/windows/kernel32/kernel32.factor @@ -315,10 +315,10 @@ C-STRUCT: MEMORY_BASIC_INFORMATION { "DWORD" "type" } ; C-STRUCT: GUID - { "ulong" "Data1" } - { "ushort" "Data2" } - { "ushort" "Data3" } - { { "uchar" 8 } "Data4" } ; + { "ULONG" "Data1" } + { "WORD" "Data2" } + { "WORD" "Data3" } + { { "UCHAR" 8 } "Data4" } ; : SE_CREATE_TOKEN_NAME "SeCreateTokenPrivilege" ; diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index 6b1a57a098..63ee6627c4 100644 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -30,7 +30,7 @@ TYPEDEF: long* LPLONG TYPEDEF: long LONG_PTR TYPEDEF: long* PLONG_PTR -TYPEDEF: int ULONG +TYPEDEF: uint ULONG TYPEDEF: void* ULONG_PTR TYPEDEF: void* PULONG_PTR