diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2013-02-12 03:10:05 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2013-02-12 03:41:51 +0400 |
| commit | f378e23a3fe5e9c892bf55034936bb10da18840b (patch) | |
| tree | 411e8df97b464491adc3cdb380be58abd76b2100 /mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher | |
| parent | b8f81467e0d0e1d4e7dbcfaf94c2ffddde08adff (diff) | |
Since NET_2_1 implies NET_4_* now, take this into account and simplify our ifdefs.
Diffstat (limited to 'mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher')
| -rw-r--r-- | mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs index 9f10c3de8e5..81ea8544649 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs @@ -642,7 +642,7 @@ namespace System.ServiceModel.Dispatcher var ms = Stream as MemoryStream; if (ms == null) { ms = new MemoryStream (); -#if NET_4_0 || NET_2_1 +#if NET_4_0 Stream.CopyTo (ms); #else byte [] tmp = new byte [0x1000]; |