Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -528,7 +528,7 @@ namespace Mono.Data.Sqlite
}
#if MONOTOUCH
[MonoTouch.MonoPInvokeCallback (typeof (SQLiteCollation))]
[Mono.Util.MonoPInvokeCallback (typeof (SQLiteCollation))]
internal static int collation_callback (IntPtr puser, int len1, IntPtr pv1, int len2, IntPtr pv2)
{
var handle = GCHandle.FromIntPtr (puser);
@@ -536,7 +536,7 @@ namespace Mono.Data.Sqlite
return func._CompareFunc (IntPtr.Zero, len1, pv1, len2, pv2);
}
[MonoTouch.MonoPInvokeCallback (typeof (SQLiteCollation))]
[Mono.Util.MonoPInvokeCallback (typeof (SQLiteCollation))]
internal static int collation_callback16 (IntPtr puser, int len1, IntPtr pv1, int len2, IntPtr pv2)
{
var handle = GCHandle.FromIntPtr (puser);