From: Joe Groff <arcata@gmail.com>
Date: Tue, 22 Apr 2008 03:18:10 +0000 (-0700)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~3433^2~10
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=e5eebeb6139cbca3f207bb81bcd0518a1444f0e7

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

Conflicts:

	extra/windows/ole32/ole32.factor
---

e5eebeb6139cbca3f207bb81bcd0518a1444f0e7
diff --cc extra/windows/ole32/ole32.factor
index 3be442514c,6e06830130..ae3dafbc9f
--- a/extra/windows/ole32/ole32.factor
+++ b/extra/windows/ole32/ole32.factor
@@@ -4,10 -4,16 +4,10 @@@ IN: windows.ole3
  
  LIBRARY: ole32
  
 -C-STRUCT: GUID
 -    { "DWORD" "part1" }
 -    { "DWORD" "part2" }
 -    { "DWORD" "part3" }
 -    { "DWORD" "part4" } ;
 -
 -TYPEDEF: void* REFGUID
 +TYPEDEF: GUID* REFGUID
  TYPEDEF: void* LPUNKNOWN
- TYPEDEF: ushort* LPOLESTR
- TYPEDEF: ushort* LPCOLESTR
+ TYPEDEF: wchar_t* LPOLESTR
+ TYPEDEF: wchar_t* LPCOLESTR
  
  TYPEDEF: REFGUID REFIID
  TYPEDEF: REFGUID REFCLSID