Index: System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
==================================================================
--- System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
+++ System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
@@ -41,11 +41,11 @@
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
-#if INTEROP_LOG
+#if USE_INTEROP_DLL && INTEROP_LOG
if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
}
Index: System.Data.SQLite/SQLite3.cs
==================================================================
--- System.Data.SQLite/SQLite3.cs
+++ System.Data.SQLite/SQLite3.cs
@@ -1533,10 +1533,11 @@
#if !PLATFORM_COMPACTFRAMEWORK
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
@@ -1597,10 +1598,11 @@
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
@@ -1616,10 +1618,11 @@
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
@@ -1685,10 +1688,11 @@
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
@@ -1704,10 +1708,11 @@
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
@@ -1723,10 +1728,11 @@
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
#elif !SQLITE_STANDARD
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
#else
+ SQLiteErrorCode n = SQLiteErrorCode.Ok;
throw new NotImplementedException();
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
break;
}
Index: System.Data.SQLite/SQLiteConnection.cs
==================================================================
--- System.Data.SQLite/SQLiteConnection.cs
+++ System.Data.SQLite/SQLiteConnection.cs
@@ -879,11 +879,11 @@
SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2;
}
}
#endif
-#if INTEROP_LOG
+#if USE_INTEROP_DLL && INTEROP_LOG
if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
}
Index: System.Data.SQLite/SQLiteLog.cs
==================================================================
--- System.Data.SQLite/SQLiteLog.cs
+++ System.Data.SQLite/SQLiteLog.cs
@@ -102,11 +102,11 @@
///
private static SQLiteLogEventHandler _defaultHandler;
///////////////////////////////////////////////////////////////////////
-#if !INTEROP_LOG
+#if !USE_INTEROP_DLL || !INTEROP_LOG
///
/// The log callback passed to native SQLite engine. This must live
/// as long as the SQLite library has a pointer to it.
///
private static SQLiteLogCallback _callback;
@@ -176,11 +176,11 @@
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
#endif
-#if !INTEROP_LOG
+#if !USE_INTEROP_DLL || !INTEROP_LOG
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
{
@@ -243,11 +243,11 @@
// NOTE: Disable logging. If necessary, it can be re-enabled
// later by the Initialize method.
//
_enabled = false;
-#if !INTEROP_LOG
+#if !USE_INTEROP_DLL || !INTEROP_LOG
//
// BUGBUG: This will cause serious problems if other AppDomains
// have any open SQLite connections; however, there is
// currently no way around this limitation.
//
Index: test/TestCases.cs
==================================================================
--- test/TestCases.cs
+++ test/TestCases.cs
@@ -21,11 +21,11 @@
private const int ThreadTimeout = 60000;
private List droptables = new List();
private List maydroptable = new List();
-#if !INTEROP_LOG
+#if !USE_INTEROP_DLL || !INTEROP_LOG
private long logevents = 0;
#endif
internal TestCases()
{
@@ -1638,11 +1638,11 @@
cnn.Close();
}
}
-#if !INTEROP_LOG
+#if !USE_INTEROP_DLL || !INTEROP_LOG
//Logging EventHandler
public void OnLogEvent(object sender, LogEventArgs logEvent)
{
object errorCode = logEvent.ErrorCode;
string err_msg = logEvent.Message;