System.Data.SQLite

Check-in [6eb5fdb936]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Skip compiling in the native library pre-loading code if the mixed-mode assembly is being built.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6eb5fdb936e35227035fd24ba738a63864c12071
User & Date: mistachkin 2012-02-22 04:13:35.638
Context
2012-02-22
05:39
Fix typo in reference to the openFlags parameter of the SQLite3_UTF16.Open method. check-in: b3d26cefe0 user: mistachkin tags: trunk
04:13
Skip compiling in the native library pre-loading code if the mixed-mode assembly is being built. check-in: 6eb5fdb936 user: mistachkin tags: trunk
03:54
Add experimental support for pre-loading the native SQLite library based on the processor architecture of the current process. For now, this feature is disabled by default. check-in: d3df632e9f user: mistachkin tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
︙︙
26
27
28
29
30
31
32














33
34
35
36
37
38
39


#if !PLATFORM_COMPACTFRAMEWORK && !DEBUG
  [SuppressUnmanagedCodeSecurity]
#endif
  internal static class UnsafeNativeMethods
  {
      #region Optional Native SQLite Library Pre-Loading Code














#if PRELOAD_NATIVE_LIBRARY
#if !PLATFORM_COMPACTFRAMEWORK
      /// <summary>
      /// The name of the environment variable containing the processor
      /// architecture of the current process.
      /// </summary>
      private static readonly string PROCESSOR_ARCHITECTURE =








>
>
>
>
>
>
>
>
>
>
>
>
>
>








26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53


#if !PLATFORM_COMPACTFRAMEWORK && !DEBUG
  [SuppressUnmanagedCodeSecurity]
#endif
  internal static class UnsafeNativeMethods
  {
      #region Optional Native SQLite Library Pre-Loading Code
      //
      // NOTE: If we are looking for the standard SQLite DLL ("sqlite3.dll"),
      //       the interop DLL ("SQLite.Interop.dll"), or we are running on the
      //       .NET Compact Framework, we should include this code (only if the
      //       feature has actually been enabled).  This code would be totally
      //       redundant if this module has been bundled into the mixed-mode
      //       assembly.
      //
#if SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK

      //
      // NOTE: Only compile in the native library pre-load code if the feature
      //       has been enabled for this build.
      //
#if PRELOAD_NATIVE_LIBRARY
#if !PLATFORM_COMPACTFRAMEWORK
      /// <summary>
      /// The name of the environment variable containing the processor
      /// architecture of the current process.
      /// </summary>
      private static readonly string PROCESSOR_ARCHITECTURE =
︙︙
345
346
347
348
349
350
351

352
353
354
355
356
357
358

              {
                  // do nothing.
              }
          }

          return IntPtr.Zero;
      }

#endif
      #endregion

      /////////////////////////////////////////////////////////////////////////

#if !SQLITE_STANDARD









>








359
360
361
362
363
364
365
366
367
368
369
370
371
372
373

              {
                  // do nothing.
              }
          }

          return IntPtr.Zero;
      }
#endif
#endif
      #endregion

      /////////////////////////////////////////////////////////////////////////

#if !SQLITE_STANDARD
︙︙