diff options
| author | Andi McClure <andi.mcclure@xamarin.com> | 2017-03-21 00:25:18 +0300 |
|---|---|---|
| committer | Andi McClure <andi.mcclure@xamarin.com> | 2017-03-31 00:57:00 +0300 |
| commit | 2ffb9a35a746a57d77d8a6d5bf504ec64e55b231 (patch) | |
| tree | d1f3198b5d0275fc832f88225c7ed5b6c61d5a33 /mcs/class/System/System.Net.NetworkInformation/Ping.cs | |
| parent | 7a04c99af19ed8975aa36f8c5416ca421a16f2bd (diff) | |
Combined cherrypick of changes between mono-4.8.0-branch and orbis-branch-30
ORBIS #ifdefs in BCL, exclude several files and assembly directories
from the orbis build, HAVE_LOCALTIME_R define in C.
Diffstat (limited to 'mcs/class/System/System.Net.NetworkInformation/Ping.cs')
| -rw-r--r-- | mcs/class/System/System.Net.NetworkInformation/Ping.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System/System.Net.NetworkInformation/Ping.cs b/mcs/class/System/System.Net.NetworkInformation/Ping.cs index 90d0e3a59ca..f1f5936be75 100644 --- a/mcs/class/System/System.Net.NetworkInformation/Ping.cs +++ b/mcs/class/System/System.Net.NetworkInformation/Ping.cs @@ -89,7 +89,7 @@ namespace System.Net.NetworkInformation { public event PingCompletedEventHandler PingCompleted; -#if !MONOTOUCH +#if !MONOTOUCH && !ORBIS static Ping () { if (Environment.OSVersion.Platform == PlatformID.Unix) { @@ -122,7 +122,7 @@ namespace System.Net.NetworkInformation { identifier = (ushort)(randomIdentifier [0] + (randomIdentifier [1] << 8)); } -#if !MONOTOUCH +#if !MONOTOUCH && !ORBIS [DllImport ("libc", EntryPoint="capget")] static extern int capget (ref cap_user_header_t header, ref cap_user_data_t data); |