New upstream version 1.41.1+dfsg1

[rustc.git] / vendor / winapi / src / um / ws2spi.rs

diff --git a/vendor/winapi/src/um/ws2spi.rs b/vendor/winapi/src/um/ws2spi.rs
index 61582f7fb69836ab65588f9c4ae8359624af03fe..d26128949164b21ca377454b4c1fc9ca5f2a8e0b 100644 (file)
--- a/vendor/winapi/src/um/ws2spi.rs
+++ b/vendor/winapi/src/um/ws2spi.rs
@@ -1,4 +1,3 @@
-// Copyright © 2015-2017 winapi-rs developers
 // Licensed under the Apache License, Version 2.0
 // <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
@@ -20,7 +19,7 @@ use um::winsock2::{
     LPWSAOVERLAPPED_COMPLETION_ROUTINE, LPWSAPROTOCOL_INFOW, LPWSAQUERYSET2W, LPWSAQUERYSETW,
     LPWSASERVICECLASSINFOW, SOCKET, WSAESETSERVICEOP, WSAEVENT, fd_set, timeval,
 };
-#[cfg(target_arch = "x86_64")]
+#[cfg(target_pointer_width = "64")]
 use um::winsock2::{LPWSANAMESPACE_INFOEXW, LPWSANAMESPACE_INFOW};
 use vc::vcruntime::size_t;
 pub const WSPDESCRIPTION_LEN: usize = 255;
@@ -268,7 +267,7 @@ FN!{stdcall LPWSPSTRINGTOADDRESS(
     lpAddressLength: LPINT,
     lpErrno: LPINT,
 ) -> c_int}
-STRUCT!{struct WSPPROC_TABLE{
+STRUCT!{struct WSPPROC_TABLE {
     lpWSPAccept: LPWSPACCEPT,
     lpWSPAddressToString: LPWSPADDRESSTOSTRING,
     lpWSPAsyncSelect: LPWSPASYNCSELECT,
@@ -427,7 +426,7 @@ FN!{stdcall LPWSCENUMPROTOCOLS(
     lpErrno: LPINT,
 ) -> c_int}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCEnumProtocols32(
         lpiProtocols: LPINT,
         lpProtocolBuffer: LPWSAPROTOCOL_INFOW,
@@ -444,7 +443,7 @@ FN!{stdcall LPWSCDEINSTALLPROVIDER(
     lpErrno: LPINT,
 ) -> c_int}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCDeinstallProvider32(
         lpProviderId: LPGUID,
         lpErrno: LPINT,
@@ -465,7 +464,7 @@ FN!{stdcall LPWSCINSTALLPROVIDER(
     lpErrno: LPINT,
 ) -> c_int}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCInstallProvider64_32(
         lpProviderId: LPGUID,
         lpszProviderDllPath: *const WCHAR,
@@ -487,7 +486,7 @@ FN!{stdcall LPWSCGETPROVIDERPATH(
     lpErrno: LPINT,
 ) -> c_int}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCGetProviderPath32(
         lpProviderId: LPGUID,
         lpszProviderDllPath: *mut WCHAR,
@@ -509,7 +508,7 @@ FN!{stdcall LPWSCUPDATEPROVIDER(
     dwNumberOfEntries: DWORD,
     lpErrno: LPINT,
 ) -> c_int}
-#[cfg(target_arch = "x86_64")]
+#[cfg(target_pointer_width = "64")]
 extern "system" {
     pub fn WSCUpdateProvider32(
         lpProviderId: LPGUID,
@@ -553,7 +552,7 @@ extern "system" {
         Flags: DWORD,
         lpErrno: LPINT,
     ) -> c_int;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCSetProviderInfo32(
         lpProviderId: LPGUID,
         InfoType: WSC_PROVIDER_INFO_TYPE,
@@ -562,7 +561,7 @@ extern "system" {
         Flags: DWORD,
         lpErrno: LPINT,
     ) -> c_int;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCGetProviderInfo32(
         lpProviderId: LPGUID,
         InfoType: WSC_PROVIDER_INFO_TYPE,
@@ -665,12 +664,12 @@ extern "system" {
         lpThreadId: LPWSATHREADID,
         lpErrno: LPINT,
     ) -> c_int;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCEnumNameSpaceProviders32(
         lpdwBufferLength: LPDWORD,
         lpnspBuffer: LPWSANAMESPACE_INFOW,
     ) -> INT;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCEnumNameSpaceProvidersEx32(
         lpdwBufferLength: LPDWORD,
         lpnspBuffer: LPWSANAMESPACE_INFOEXW,
@@ -691,7 +690,7 @@ FN!{stdcall LPWSCINSTALLNAMESPACE(
     lpProviderId: LPGUID,
 ) -> INT}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCInstallNameSpace32(
         lpszIdentifier: LPWSTR,
         lpszPathName: LPWSTR,
@@ -715,7 +714,7 @@ extern "system" {
         lpProviderId: LPGUID,
         lpProviderSpecific: LPBLOB,
     ) -> INT;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCInstallNameSpaceEx32(
         lpszIdentifier: LPWSTR,
         lpszPathName: LPWSTR,
@@ -724,7 +723,7 @@ extern "system" {
         lpProviderId: LPGUID,
         lpProviderSpecific: LPBLOB,
     ) -> INT;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCUnInstallNameSpace32(
         lpProviderId: LPGUID,
     ) -> INT;
@@ -738,12 +737,12 @@ FN!{stdcall LPWSCENABLENSPROVIDER(
     fEnable: BOOL,
 ) -> INT}
 extern "system" {
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCEnableNSProvider32(
         lpProviderId: LPGUID,
         fEnable: BOOL,
     ) -> INT;
-    #[cfg(target_arch = "x86_64")]
+    #[cfg(target_pointer_width = "64")]
     pub fn WSCInstallProviderAndChains64_32(
         lpProviderId: LPGUID,
         lpszProviderDllPath: LPWSTR,
@@ -755,7 +754,7 @@ extern "system" {
         lpdwCatalogEntryId: LPDWORD,
         lpErrno: LPINT,
     ) -> c_int;
-    #[cfg(any(target_arch = "x86", target_arch = "arm"))]
+    #[cfg(target_pointer_width = "32")]
     pub fn WSCInstallProviderAndChains(
         lpProviderId: LPGUID,
         lpszProviderDllPath: LPWSTR,