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/referencesource | |
| 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/referencesource')
| -rw-r--r-- | mcs/class/referencesource/System/net/System/Net/webproxy.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/referencesource/System/net/System/Net/webproxy.cs b/mcs/class/referencesource/System/net/System/Net/webproxy.cs index b4ec154380d..80fef4d94d1 100644 --- a/mcs/class/referencesource/System/net/System/Net/webproxy.cs +++ b/mcs/class/referencesource/System/net/System/Net/webproxy.cs @@ -504,7 +504,7 @@ namespace System.Net { #if MONO public static IWebProxy CreateDefaultProxy () { -#if FEATURE_NO_BSD_SOCKETS +#if FEATURE_NO_BSD_SOCKETS || ORBIS throw new PlatformNotSupportedException (); #elif MONOTOUCH return Mono.Net.CFNetwork.GetDefaultProxy (); |