mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #16571 : pcwalton/rust/register-snapshots, r=pcwalton

Browse Source
This commit is contained in:
bors 2014-08-18 13:41:05 +00:00
commit 7074592ee1
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/liblibc/lib.rs
View File

@ -1456,14 +1456,6 @@ pub struct GUID {
pub Data4: [BYTE, ..8],
}
// NOTE(pcwalton, stage0): Remove after snapshot (typeck bug
// workaround).
#[cfg(stage0)]
pub struct WSAPROTOCOLCHAIN {
pub ChainLen: c_int,
pub ChainEntries: [DWORD, ..MAX_PROTOCOL_CHAIN],
}
#[cfg(not(stage0))]
pub struct WSAPROTOCOLCHAIN {
pub ChainLen: c_int,
pub ChainEntries: [DWORD, ..MAX_PROTOCOL_CHAIN as uint],
@ -1471,32 +1463,6 @@ pub struct WSAPROTOCOLCHAIN {
pub type LPWSAPROTOCOLCHAIN = *mut WSAPROTOCOLCHAIN;
// NOTE(pcwalton, stage0): Remove after snapshot (typeck bug
// workaround).
#[cfg(stage0)]
pub struct WSAPROTOCOL_INFO {
pub dwServiceFlags1: DWORD,
pub dwServiceFlags2: DWORD,
pub dwServiceFlags3: DWORD,
pub dwServiceFlags4: DWORD,
pub dwProviderFlags: DWORD,
pub ProviderId: GUID,
pub dwCatalogEntryId: DWORD,
pub ProtocolChain: WSAPROTOCOLCHAIN,
pub iVersion: c_int,
pub iAddressFamily: c_int,
pub iMaxSockAddr: c_int,
pub iMinSockAddr: c_int,
pub iSocketType: c_int,
pub iProtocol: c_int,
pub iProtocolMaxOffset: c_int,
pub iNetworkByteOrder: c_int,
pub iSecurityScheme: c_int,
pub dwMessageSize: DWORD,
pub dwProviderReserved: DWORD,
pub szProtocol: [u8, ..WSAPROTOCOL_LEN+1],
}
#[cfg(not(stage0))]
pub struct WSAPROTOCOL_INFO {
pub dwServiceFlags1: DWORD,
pub dwServiceFlags2: DWORD,

8
src/snapshots.txt
View File

@ -1,3 +1,11 @@
S 2014-08-17 a86d9ad
freebsd-x86_64 f49e0c8e64c8a60dc47df9965974d2a98ef70b34
linux-i386 8f2c5f6a1b6504ee63de73c7a53aee1e4b07bca5
linux-x86_64 c04f92c5583d92217ea9641a8e0a3108acbc5283
macos-i386 2f1e849bab50ce2b92f5eb0ef5a63954904cac97
macos-x86_64 977a8e496dd4ccf79c86a93a1794e65213d76f96
winnt-i386 c2b08d721c5c1628aea4932c0e09e5bf07d54881
S 2014-08-14 aa98b25
freebsd-x86_64 6a84283dfd8600fca6ec08144228f405ad9fe333
linux-i386 6aeac588b086a99f81b53cfadd15617c82c540aa