Merge pull request #2020 from tomjepp/master

[mono.git] / mcs / class / System / System.Net / WebResponse.cs

diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
index 9b9fab50815ec1fca4d8e030e70fbb34321d6887..f59b24fc1c38cfbe8e491a3db3fc8cf81f7d000a 100644 (file)
--- a/mcs/class/System/System.Net/WebResponse.cs
+++ b/mcs/class/System/System.Net/WebResponse.cs
@@ -85,7 +85,6 @@ namespace System.Net
                public virtual Uri ResponseUri {                \r
                        get { throw new NotSupportedException (); }\r
                }               \r
-#if NET_4_0\r
 \r
                public virtual bool SupportsHeaders {\r
                        get {\r
@@ -94,7 +93,6 @@ namespace System.Net
                                return true;\r
                        }\r
                }\r
-#endif\r
                // Methods\r
                \r
                public virtual void Close()\r
@@ -106,28 +104,16 @@ namespace System.Net
                {\r
                        throw new NotSupportedException ();\r
                }\r
-#if TARGET_JVM //enable overrides for extenders\r
-               public virtual void Dispose()\r
-#elif NET_4_0\r
                public void Dispose ()\r
-#else\r
-               void IDisposable.Dispose()\r
-#endif\r
                {\r
-#if NET_4_0\r
                        Dispose (true);\r
-#else\r
-                       Close ();\r
-#endif\r
                }\r
                \r
-#if NET_4_0\r
                protected virtual void Dispose (bool disposing)\r
                {\r
                        if (disposing)\r
                                Close ();\r
                }\r
-#endif\r
 \r
                void ISerializable.GetObjectData\r
                        (SerializationInfo serializationInfo,\r