X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mcs%2Fclass%2FMono.Data.Sqlite%2FMono.Data.Sqlite_2.0%2FSQLite3.cs;h=6b2ee13e03a86fed9d1c387bf2dbb38b85bdd904;hb=30cddad5fb4c3d290906a6e6c33ecd8b07d8b48c;hp=6f757238cd4139809efe4ca4230369ff3344c0bc;hpb=a26d35379ebb2be5aa988233fd8837f524643d2e;p=mono.git

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
index 6f757238cd4..6b2ee13e03a 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
@@ -125,9 +125,9 @@ namespace Mono.Data.Sqlite
 	// Compatibility with versions < 3.5.0
         int n;
 
-	try {
+	if (UnsafeNativeMethods.use_sqlite3_open_v2) {
 		n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), out db, (int)flags, IntPtr.Zero);
-	} catch (EntryPointNotFoundException) {
+	} else {
 		Console.WriteLine ("Your sqlite3 version is old - please upgrade to at least v3.5.0!");
 		n = UnsafeNativeMethods.sqlite3_open (ToUTF8 (strFilename), out db);
 	}
@@ -706,7 +706,7 @@ namespace Mono.Data.Sqlite
     }
 
 #if MONOTOUCH
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteCallback))]
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteCallback))]
     internal static void scalar_callback(IntPtr context, int nArgs, IntPtr argsptr)
     {
       var handle = GCHandle.FromIntPtr (UnsafeNativeMethods.sqlite3_user_data(context));
@@ -714,7 +714,7 @@ namespace Mono.Data.Sqlite
       func.Func(context, nArgs, argsptr);
     }
 
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteCallback))]
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteCallback))]
     internal static void step_callback(IntPtr context, int nArgs, IntPtr argsptr)
     {
       var handle = GCHandle.FromIntPtr(UnsafeNativeMethods.sqlite3_user_data(context));
@@ -722,7 +722,7 @@ namespace Mono.Data.Sqlite
       func.FuncStep(context, nArgs, argsptr);
     }
 
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]
     internal static void final_callback(IntPtr context)
     {
       var handle = GCHandle.FromIntPtr(UnsafeNativeMethods.sqlite3_user_data(context));
@@ -730,7 +730,7 @@ namespace Mono.Data.Sqlite
       func.FuncFinal(context);
     }
 
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]
     internal static void destroy_callback(IntPtr context)
     {
       GCHandle.FromIntPtr(context).Free();
@@ -958,7 +958,7 @@ namespace Mono.Data.Sqlite
     SQLiteCommitCallback commit_callback;
     SQLiteRollbackCallback rollback_callback;
 		
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteUpdateCallback))]
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteUpdateCallback))]
     static void update (IntPtr puser, int type, IntPtr database, IntPtr table, Int64 rowid)
     {
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;
@@ -974,7 +974,7 @@ namespace Mono.Data.Sqlite
         UnsafeNativeMethods.sqlite3_update_hook (_sql, update, GCHandle.ToIntPtr (gch));
     }
 
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteCommitCallback))]
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteCommitCallback))]
     static int commit (IntPtr puser)
     {
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;
@@ -990,7 +990,7 @@ namespace Mono.Data.Sqlite
         UnsafeNativeMethods.sqlite3_commit_hook (_sql, commit, GCHandle.ToIntPtr (gch));
     }
 
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteRollbackCallback))]
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteRollbackCallback))]
     static void rollback (IntPtr puser)
     {
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;