From: Jürg Billeter <j@bitron.ch>
Date: Thu, 18 Dec 2008 17:59:44 +0000 (+0000)
Subject: Fix sqlite3_callback binding
X-Git-Tag: VALA_0_5_4~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca61657a06e5070aefb7f18e6adff97392522b8d;p=thirdparty%2Fvala.git

Fix sqlite3_callback binding

2008-12-18  Jürg Billeter  <j@bitron.ch>

	* vapi/sqlite3.vapi:

	Fix sqlite3_callback binding

svn path=/trunk/; revision=2212
---

diff --git a/ChangeLog b/ChangeLog
index 86600fa1a..ca404f76d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-18  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/sqlite3.vapi:
+
+	Fix sqlite3_callback binding
+
 2008-12-18  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valaccodemethodcallmodule.vala:
diff --git a/vapi/sqlite3.vapi b/vapi/sqlite3.vapi
index d098b4aa6..6a62a06ad 100644
--- a/vapi/sqlite3.vapi
+++ b/vapi/sqlite3.vapi
@@ -28,7 +28,7 @@ namespace Sqlite {
 	public class Database {
 		public int busy_timeout (int ms);
 		public int changes ();
-		public int exec (string sql, Callback? sqlite3_callback = null, void* data = null, out string errmsg = null);
+		public int exec (string sql, Callback? sqlite3_callback = null, out string errmsg = null);
 		public int extended_result_codes (int onoff);
 		public int get_autocommit ();
 		public void interrupt ();
@@ -82,8 +82,8 @@ namespace Sqlite {
 	}
 
 	[NoArrayLength]
-	[CCode (cname = "sqlite3_callback")]
-	public static delegate int Callback (void* data, int n_columns, string[] values, string[] column_names);
+	[CCode (cname = "sqlite3_callback", instance_pos = 0)]
+	public delegate int Callback (int n_columns, string[] values, string[] column_names);
 
 	[CCode (cname = "SQLITE_OK")]
 	public const int OK;