TARGET_JVM build changes

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

mcs/class/System.Data/System.Data.Common/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-22  Konstantin Triger <[email protected]>
+
+	* DbProviderFactory.cs: TARGET_JVM ifdef.
+
 2005-11-21  Senganal T <[email protected]>
 
 	* DbDataAdapter.cs

mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs

@@ -115,13 +115,13 @@ namespace System.Data.Common {
 		{
 			throw new NotImplementedException ();
 		}
-
+#if NET_2_0 
 		[MonoTODO]
 		public virtual DbConnectionStringBuilder CreateConnectionStringBuilder ()
 		{
 			throw new NotImplementedException ();
 		}
-		
+#endif
 		#endregion // Methods
 	}
 }

mcs/class/System.Data/System.Data/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-26  Konstantin Triger <[email protected]>
+
+	* ConflictOption.cs: TARGET_JVM include.
+
 2005-11-11  Senganal T <[email protected]>
 	
 	* ConflictOption.cs (new file)

mcs/class/System.Data/System.Data/ConflictOption.cs

@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 || TARGET_JVM
 
 namespace System.Data {
 	public enum ConflictOption