Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix compilation issues when the native library pre-loader is not enabled. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
fd918a4eef21d97587f27140612498cd |
| User & Date: | mistachkin 2016-03-23 05:38:46 |
Context
|
2016-03-23
| ||
| 17:50 | Further portability enhancements for the native library pre-loader and the 'vtshim' extension loader, permitting it to work better on POSIX. check-in: 4b1c267ac6 user: mistachkin tags: trunk | |
| 05:38 | Fix compilation issues when the native library pre-loader is not enabled. check-in: fd918a4eef user: mistachkin tags: trunk | |
| 05:22 | More test constraints for Mono 4.2. check-in: d92e5e9396 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
#if INTEROP_VIRTUAL_TABLE
/// <summary>
/// This is the name of the native library file that contains the
/// "vtshim" extension [wrapper].
/// </summary>
protected string _shimExtensionFileName =
UnsafeNativeMethods.GetNativeLibraryFileNameOnly();
/// <summary>
/// This is the name of the native entry point for the "vtshim"
/// extension [wrapper].
/// </summary>
protected string _shimExtensionProcName = "sqlite3_vtshim_init";
|
> > > > |
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
#if INTEROP_VIRTUAL_TABLE
/// <summary>
/// This is the name of the native library file that contains the
/// "vtshim" extension [wrapper].
/// </summary>
protected string _shimExtensionFileName =
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.GetNativeLibraryFileNameOnly();
#else
UnsafeNativeMethods.SQLITE_DLL;
#endif
/// <summary>
/// This is the name of the native entry point for the "vtshim"
/// extension [wrapper].
/// </summary>
protected string _shimExtensionProcName = "sqlite3_vtshim_init";
|
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 |
#endif
#elif SQLITE_STANDARD
//
// NOTE: Otherwise, if the standard SQLite library is enabled, use it.
//
internal const string SQLITE_DLL = "sqlite3";
#elif USE_INTEROP_DLL
//
// NOTE: Otherwise, if the native SQLite interop assembly is enabled,
// use it.
//
#if SQLITE_STANDARD_LIBRARY_NAME
internal const string SQLITE_DLL = "sqlite3";
#else
internal const string SQLITE_DLL = "SQLite.Interop.dll";
|
| |
1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 |
#endif
#elif SQLITE_STANDARD
//
// NOTE: Otherwise, if the standard SQLite library is enabled, use it.
//
internal const string SQLITE_DLL = "sqlite3";
#elif USE_INTEROP_DLL
//
// NOTE: Otherwise, if the native SQLite interop assembly is enabled,
// use it.
//
#if SQLITE_STANDARD_LIBRARY_NAME
internal const string SQLITE_DLL = "sqlite3";
#else
internal const string SQLITE_DLL = "SQLite.Interop.dll";
|