diff options
| author | Daniel Morgan <monodanmorg@yahoo.com> | 2002-10-13 13:54:21 +0400 |
|---|---|---|
| committer | Daniel Morgan <monodanmorg@yahoo.com> | 2002-10-13 13:54:21 +0400 |
| commit | 4c4c4cfa95fb902547a7449f0ea588a92b621479 (patch) | |
| tree | 5203a5b588bcc02616b5604075aa07d941f7a431 /mcs | |
| parent | dcd385f83023b928c16f2465778168960a26f45a (diff) | |
2002-10-13 Daniel Morgan <danmorg@sc.rr.com>
* Mono.Data.SqliteClient: add file
to build on Windows
* Mono.Data.SqliteClient/SqliteCommand.cs: modified
added unsafe { } around call to sqlite_exec() which calls
an unsafe method SqliteCallbackFunction
svn path=/trunk/mcs/; revision=8212
Diffstat (limited to 'mcs')
3 files changed, 63 insertions, 5 deletions
diff --git a/mcs/class/Mono.Data.SqliteClient/ChangeLog b/mcs/class/Mono.Data.SqliteClient/ChangeLog index 04ac1bf0a7a..348d9b782b6 100644 --- a/mcs/class/Mono.Data.SqliteClient/ChangeLog +++ b/mcs/class/Mono.Data.SqliteClient/ChangeLog @@ -1,3 +1,12 @@ +2002-10-13 Daniel Morgan <danmorg@sc.rr.com> + + * Mono.Data.SqliteClient: add file + to build on Windows + + * Mono.Data.SqliteClient/SqliteCommand.cs: modified + added unsafe { } around call to sqlite_exec() which calls + an unsafe method SqliteCallbackFunction + 2002-10-12 Vladimir Vukicevic <vladimir@pobox.com> * Mono.Data.SqlClient/SqliteCobmmand.cs, SqliteDataReader.cs, diff --git a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.build b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.build new file mode 100644 index 00000000000..276a8c3dd08 --- /dev/null +++ b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient.build @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for Mono.Data.SqliteClient.dll -->
+
+<project name="Mono.Data.SqliteClient" default="build">
+ <property name="debug" value="false"/>
+
+ <target name="build">
+ <csc target="library" output="../lib/Mono.Data.SqliteClient.dll" debug="${debug}">
+ <arg value="/nowarn:1595"/>
+ <arg value="/nowarn:0067"/>
+ <arg value="/nowarn:0109"/>
+ <arg value="/nowarn:0169"/>
+ <arg value="/nowarn:0649"/>
+ <arg value="/unsafe"/>
+ <arg value="/noconfig"/>
+ <arg value="/r:System.dll"/>
+ <arg value="/r:System.Xml.dll"/>
+ <arg value="/r:System.Data.dll"/>
+ <sources>
+ <includes name="**/*.cs"/>
+ <excludes name="Test/**"/>
+
+ </sources>
+ <references>
+ <includes name="../lib/corlib.dll"/>
+ <includes name="../lib/System.dll"/>
+ <includes name="../lib/System.Xml.dll"/>
+ <includes name="../lib/System.Data.dll"/>
+ </references>
+ </csc>
+ <copy file="../lib/System.Data.dll" tofile="Test/System.Data.dll"/>
+ <copy file="../lib/Mono.Data.SqliteClient.dll" tofile="Test/Mono.Data.SqliteClient.dll"/>
+ <copy file="../lib/Mono.Data.SqliteClient.dll" tofile="Mono.Data.SqliteClient/Mono.Data.SqliteClient.dll"/>
+ <copy file="../lib/Mono.Data.SqliteClient.dll" tofile="../System.Data/Test/Mono.Data.SqliteClient.dll"/>
+ </target>
+ <target name="test" depends="build">
+ <nant basedir="Test" target="test"/>
+ </target>
+ <target name="clean">
+ <delete file="../lib/System.Data.dll" failonerror="false"/>
+ <delete file="Test/System.Data.dll" failonerror="false"/>
+ <delete file="../lib/Mono.Data.SqliteClient.dll" failonerror="false"/>
+ <delete file="Test/Mono.Data.SqliteClient.dll" failonerror="false"/>
+
+ </target>
+</project>
diff --git a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs index 09e6596afb5..633d0fd97a8 100644 --- a/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs +++ b/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs @@ -196,11 +196,13 @@ namespace Mono.Data.SqliteClient { try { if (want_results) { reader = new SqliteDataReader (this); - err = sqlite_exec (parent_conn.Handle, - sql, - new SqliteCallbackFunction (reader.SqliteCallback), - IntPtr.Zero, - IntPtr.Zero); + unsafe { + err = sqlite_exec (parent_conn.Handle, + sql, + new SqliteCallbackFunction (reader.SqliteCallback), + IntPtr.Zero, + IntPtr.Zero); + } reader.ReadingDone (); } else { err = sqlite_exec (parent_conn.Handle, |