about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-17 04:46:50 -0700
committerbors <bors@rust-lang.org>2014-04-17 04:46:50 -0700
commit1fd7de8246df1f0e3447516482147fb5440bc3bc (patch)
treec89065219035516e0ad99aa79c1b56fb7580d2b4
parentd8fa1068677f97b4e2a949047a10a2e43b9da4e4 (diff)
parentfc4c6ee462943fb7c8da76ac3ab648458a1a5b66 (diff)
downloadrust-1fd7de8246df1f0e3447516482147fb5440bc3bc.tar.gz
rust-1fd7de8246df1f0e3447516482147fb5440bc3bc.zip
auto merge of #13567 : iancormac84/rust/libc_windows_guid_fix, r=alexcrichton
structure's Data2 and Data3 members expect WORD types instead of DWORD. I
discovered this discrepancy while experimenting with some bindings to
Microsoft's OLE2 api. The discrepancy was corrupting the contents of the
string returned by UuidToString after I used known GUIDs to test the
accuracy of the function binding. I didn't add test cases because it would
mean adding a dependency to my rather incomplete binding library. However,
the fix produces expected string values when tested.
-rw-r--r--src/liblibc/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index f25734e1e21..4ec41e9488a 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -1221,8 +1221,8 @@ pub mod types {
 
                 pub struct GUID {
                     pub Data1: DWORD,
-                    pub Data2: DWORD,
-                    pub Data3: DWORD,
+                    pub Data2: WORD,
+                    pub Data3: WORD,
                     pub Data4: [BYTE, ..8],
                 }