Remove redundant TARGET_JVMs

svn path=/trunk/mcs/; revision=80795

diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
index 5b6f73174635e3e3fe2cfba1f3e87113b1f8da51..c6dcff0cf1bbab0178012a6b84975bb397545465 100644 (file)
--- a/mcs/class/System/System.Net/WebRequest.cs
+++ b/mcs/class/System/System.Net/WebRequest.cs
@@ -292,17 +292,15 @@ namespace System.Net
                        return new WebProxy ();
                }
 #endif
-#if TARGET_JVM
-               public virtual void GetObjectData
-#else
+
                void ISerializable.GetObjectData
-#endif
                (SerializationInfo serializationInfo,
                                                  StreamingContext streamingContext)
                {
                        throw new NotSupportedException ();
                }
 
+
 #if NET_2_0
                protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
                {

diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
index 5d9f30b4205460b36189f0b108dcf21bdf5f5994..ac5fbc2546597e163360737d2ee04792777df5b0 100644 (file)
--- a/mcs/class/System/System.Net/WebResponse.cs
+++ b/mcs/class/System/System.Net/WebResponse.cs
@@ -106,11 +106,8 @@ namespace System.Net
                {\r
                        Close ();\r
                }\r
-#if TARGET_JVM //enable overrides for extenders\r
-               public virtual void GetObjectData\r
-#else\r
+\r
                void ISerializable.GetObjectData\r
-#endif\r
                        (SerializationInfo serializationInfo,\r
                                                  StreamingContext streamingContext)\r
                {\r

diff --git a/mcs/class/System/System20.sln b/mcs/class/System/System20.sln
index 8647c2b0973ca15b9a9f0e401a78687e1ee4a6e9..101d66cb137dc90bb5710b39580cf2a017b3936a 100644 (file)
--- a/mcs/class/System/System20.sln
+++ b/mcs/class/System/System20.sln
@@ -1,4 +1,3 @@
-\r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
 # Visual Studio 2005\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System20", "System20.csproj", "{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}"\r
@@ -8,6 +7,7 @@ Global
                Debug_Java|Any CPU = Debug_Java|Any CPU\r
                Debug_Java20|Any CPU = Debug_Java20|Any CPU\r
                Release_Java|Any CPU = Release_Java|Any CPU\r
+               Release_Java20_Prepare|Any CPU = Release_Java20_Prepare|Any CPU\r
                Release_Java20|Any CPU = Release_Java20|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
@@ -17,6 +17,8 @@ Global
                {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
                {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
                {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20_Prepare|Any CPU.ActiveCfg = Release_Java20_Prepare|Any CPU\r
+               {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20_Prepare|Any CPU.Build.0 = Release_Java20_Prepare|Any CPU\r
                {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU\r
                {25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU\r
        EndGlobalSection\r