Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameters.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameters.cs
@ -58,7 +58,6 @@ namespace System.Drawing.Imaging
 			// Nothing
 			GC.SuppressFinalize(this);
 		}
-#if !TARGET_JVM
 		internal IntPtr ToNativePtr () {
 			IntPtr result;
 			IntPtr ptr;
@ -106,6 +105,5 @@ namespace System.Drawing.Imaging

 			return result;
 		}
-#endif
 	}
 }