From 9ec61fb8e7c08f2f464c86678e874d466b8ceb3f Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller@kbsg.rwth-aachen.de>
Date: Tue, 22 Mar 2011 23:29:28 +0100
Subject: [PATCH] sqlite3: fix compile errors on Fedora 15

---
 src/ls_sqlite3.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ls_sqlite3.c b/src/ls_sqlite3.c
index 0ddd496..cfd9a9a 100644
--- a/src/ls_sqlite3.c
+++ b/src/ls_sqlite3.c
@@ -114,12 +114,12 @@ static void push_column(lua_State *L, sqlite3_stmt *vm, int column) {
     lua_pushnumber(L, sqlite3_column_double(vm, column));
     break;
   case SQLITE_TEXT:
-    lua_pushlstring(L, sqlite3_column_text(vm, column),
-		    sqlite3_column_bytes(vm, column));
+    lua_pushlstring(L, (const char *)sqlite3_column_text(vm, column),
+		    (size_t)sqlite3_column_bytes(vm, column));
     break;
   case SQLITE_BLOB:
     lua_pushlstring(L, sqlite3_column_blob(vm, column),
-		    sqlite3_column_bytes(vm, column));
+		    (size_t)sqlite3_column_bytes(vm, column));
     break;
   case SQLITE_NULL:
     lua_pushnil(L);
@@ -519,7 +519,7 @@ static int env_connect(lua_State *L)
     }
 
   if (lua_isnumber(L, 3)) {
-  	sqlite3_busy_timeout(conn, lua_tonumber(L,3)); // TODO: remove this
+  	sqlite3_busy_timeout(conn, lua_tonumber(L,3)); /* TODO: remove this */
   }
 
   return create_connection(L, 1, conn);
@@ -546,14 +546,14 @@ static int env_close (lua_State *L)
 
 /*
 ** Sets the timeout for a lock in the connection.
-*/
 static int opts_settimeout  (lua_State *L)
 {
 	conn_data *conn = getconnection(L);
 	int milisseconds = luaL_checknumber(L, 2);
-	lua_pushnumber(L, sqlite3_busy_timeout(conn, milisseconds));
+	lua_pushnumber(L, sqlite3_busy_timeout(conn->sql_conn, milisseconds));
 	return 1;
 }
+*/
 
 /*
 ** Create metatables for each class of object.
-- 
1.7.4