Merge pull request #22 from mlubin/master

fix win32

Author: IainNZ

src/SQLite_api.jl

@@ -1,189 +1,120 @@
 function sqlite3_open(file::String,handle::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_open, sqlite3_lib), stdcall,
-			Cint, (Ptr{Uint8},Ptr{Void}),
-			file,handle)
-	@unix_only return ccall( (:sqlite3_open, sqlite3_lib),
+	return ccall( (:sqlite3_open, sqlite3_lib),
 		Cint, (Ptr{Uint8},Ptr{Void}),
 		file,handle)
 end
 function sqlite3_open16(file::String,handle::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_open16, sqlite3_lib), stdcall,
-			Cint, (Ptr{Uint8},Ptr{Void}),
-			file,handle)
-	@unix_only return ccall( (:sqlite3_open16, sqlite3_lib),
+	return ccall( (:sqlite3_open16, sqlite3_lib),
 		Cint, (Ptr{Uint8},Ptr{Void}),
 		file,handle)
 end
 function sqlite3_open_v2(file::String,handle::Array{Ptr{Void},1},flags::Cint,vfs::String)
-	@windows_only return ccall( (:sqlite3_open_v2, sqlite3_lib), stdcall,
+	return ccall( (:sqlite3_open_v2, sqlite3_lib),
 			Cint, (Ptr{Uint8},Ptr{Void},Cint,Ptr{Uint8}),
 			file,handle,flags,vfs)
-	@unix_only return ccall( (:sqlite3_open_v2, sqlite3_lib),
-		Cint, (Ptr{Uint8},Ptr{Void},Cint,Ptr{Uint8}),
-		file,handle,flags,vfs)
 end
 function sqlite3_prepare(handle::Ptr{Void},query::String,stmt::Array{Ptr{Void},1},unused::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_prepare, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
-			handle,query,length(query),stmt,unused)
-	@unix_only return ccall( (:sqlite3_prepare, sqlite3_lib),
+	return ccall( (:sqlite3_prepare, sqlite3_lib),
 		Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
 			handle,query,length(query),stmt,unused)
 end
 function sqlite3_prepare_v2(handle::Ptr{Void},query::String,stmt::Array{Ptr{Void},1},unused::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_prepare_v2, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
-			handle,query,length(query),stmt,unused)
-	@unix_only return ccall( (:sqlite3_prepare_v2, sqlite3_lib),
+	return ccall( (:sqlite3_prepare_v2, sqlite3_lib),
 		Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
 			handle,query,length(query),stmt,unused)
 end
 function sqlite3_prepare16(handle::Ptr{Void},query::String,stmt::Array{Ptr{Void},1},unused::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_prepare16, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
-			handle,query,length(query),stmt,unused)
-	@unix_only return ccall( (:sqlite3_prepare16, sqlite3_lib),
+	return ccall( (:sqlite3_prepare16, sqlite3_lib),
 		Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
 			handle,query,length(query),stmt,unused)
 end
 function sqlite3_prepare16_v2(handle::Ptr{Void},query::String,stmt::Array{Ptr{Void},1},unused::Array{Ptr{Void},1})
-	@windows_only return ccall( (:sqlite3_prepare16_v2, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
-			handle,query,length(query),stmt,unused)
-	@unix_only return ccall( (:sqlite3_prepare16_v2, sqlite3_lib),
+	return ccall( (:sqlite3_prepare16_v2, sqlite3_lib),
 		Cint, (Ptr{Void},Ptr{Uint8},Cint,Ptr{Void},Ptr{Void}),
 		handle,query,length(query),stmt,unused)
 end
 function sqlite3_step(stmt::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_step, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			stmt)
-	@unix_only return ccall( (:sqlite3_step, sqlite3_lib),
+	return ccall( (:sqlite3_step, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		stmt)
 end
 function sqlite3_column_count(stmt::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_column_count, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			stmt)
-	@unix_only return ccall( (:sqlite3_column_count, sqlite3_lib),
+	return ccall( (:sqlite3_column_count, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		stmt)
 end
 function sqlite3_column_blob(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_blob, sqlite3_lib), stdcall,
-			Ptr{Void}, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_blob, sqlite3_lib),
+	return ccall( (:sqlite3_column_blob, sqlite3_lib),
 		Ptr{Void}, (Ptr{Void},Cint),
 		stmt,col)
 end
 
 function sqlite3_column_bytes(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_bytes, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_bytes, sqlite3_lib),
+	return ccall( (:sqlite3_column_bytes, sqlite3_lib),
 		Cint, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_bytes16(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_bytes16, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_bytes16, sqlite3_lib),
+	return ccall( (:sqlite3_column_bytes16, sqlite3_lib),
 		Cint, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_double(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_double, sqlite3_lib), stdcall,
-			Cdouble, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_double, sqlite3_lib),
+	return ccall( (:sqlite3_column_double, sqlite3_lib),
 		Cdouble, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_int(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_int, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_int, sqlite3_lib),
+	return ccall( (:sqlite3_column_int, sqlite3_lib),
 		Cint, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_int64(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_int64, sqlite3_lib), stdcall,
-			Clonglong, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_int64, sqlite3_lib),
+	return ccall( (:sqlite3_column_int64, sqlite3_lib),
 		Clonglong, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_text(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_text, sqlite3_lib), stdcall,
-			Ptr{Uint8}, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_text, sqlite3_lib),
+	return ccall( (:sqlite3_column_text, sqlite3_lib),
 		Ptr{Uint8}, (Ptr{Void},Cint),
 		stmt,col)
 end
 function sqlite3_column_text16(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_text16, sqlite3_lib), stdcall,
-			Ptr{Void}, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_text16, sqlite3_lib),
+	return ccall( (:sqlite3_column_text16, sqlite3_lib),
 		Ptr{Void}, (Ptr{Void},Cint),
 		stmt,col)
 end
 const FUNCS = [SQLITE_INTEGER=>sqlite3_column_int,SQLITE_FLOAT=>sqlite3_column_double,SQLITE3_TEXT=>sqlite3_column_text,SQLITE_BLOB=>sqlite3_column_blob,SQLITE_NULL=>sqlite3_column_text]
 function sqlite3_column_type(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_column_type, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_column_type, sqlite3_lib),
+	return ccall( (:sqlite3_column_type, sqlite3_lib),
 		Cint, (Ptr{Void},Cint),
 		stmt,col)
 end
 # function sqlite3_column_value(stmt::Ptr{Void},col::Cint)
-# 	return ccall( (:sqlite3_column_value, sqlite3_lib), stdcall,
-# 			Ptr{Void}, (Ptr{Void},Cint),
-# 			stmt,col)
 # 	return ccall( (:sqlite3_column_value, sqlite3_lib),
 # 			Ptr{Void}, (Ptr{Void},Cint),
 # 			stmt,col)
 # end
 # SQLITE_API sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol);
 function sqlite3_finalize(stmt::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_finalize, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			stmt)
-	@unix_only return ccall( (:sqlite3_finalize, sqlite3_lib),
+	return ccall( (:sqlite3_finalize, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		stmt)
 end
 function sqlite3_reset(stmt::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_reset, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			stmt)
-	@unix_only return ccall( (:sqlite3_reset, sqlite3_lib),
+	return ccall( (:sqlite3_reset, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		stmt)
 end
 
 # SQLITE_API const char *sqlite3_column_name(sqlite3_stmt*, int N);
 function sqlite3_column_name(stmt::Ptr{Void},n::Int)
-	@windows_only return ccall( (:sqlite3_column_name, sqlite3_lib), stdcall,
-			Ptr{Uint8}, (Ptr{Void},Cint),
-			stmt,n)
-	@unix_only return ccall( (:sqlite3_column_name, sqlite3_lib),
+	return ccall( (:sqlite3_column_name, sqlite3_lib),
 		Ptr{Uint8}, (Ptr{Void},Cint),
 		stmt,n)
 end
 function sqlite3_column_name16(stmt::Ptr{Void},n::Int)
-	@windows_only return ccall( (:sqlite3_column_name16, sqlite3_lib), stdcall,
-			Ptr{Uint8}, (Ptr{Void},Cint),
-			stmt,n)
-	@unix_only return ccall( (:sqlite3_column_name16, sqlite3_lib),
+	return ccall( (:sqlite3_column_name16, sqlite3_lib),
 		Ptr{Uint8}, (Ptr{Void},Cint),
 		stmt,n)
 end
@@ -203,10 +134,7 @@ end
 
 function sqlite3_close(handle::Ptr{Void})
 	try
-		@windows_only return ccall( (:sqlite3_close, sqlite3_lib), stdcall,
-				Cint, (Ptr{Void},),
-				handle)
-		@unix_only return ccall( (:sqlite3_close, sqlite3_lib),
+		return ccall( (:sqlite3_close, sqlite3_lib),
 			Cint, (Ptr{Void},),
 			handle)
 	catch
@@ -215,10 +143,7 @@ function sqlite3_close(handle::Ptr{Void})
 end
 function sqlite3_close_v2(handle::Ptr{Void})
 	try
-		@windows_only return ccall( (:sqlite3_close_v2, sqlite3_lib), stdcall,
-				Cint, (Ptr{Void},),
-				handle)
-		@unix_only return ccall( (:sqlite3_close_v2, sqlite3_lib),
+		return ccall( (:sqlite3_close_v2, sqlite3_lib),
 			Cint, (Ptr{Void},),
 			handle)
 	catch
@@ -228,42 +153,27 @@ function sqlite3_close_v2(handle::Ptr{Void})
 	end
 end
 function sqlite3_initialize()
-	@windows_only return ccall( (:sqlite3_initialize, sqlite3_lib), stdcall,
-			Cint, (),
-			)
-	@unix_only return ccall( (:sqlite3_initialize, sqlite3_lib),
+	return ccall( (:sqlite3_initialize, sqlite3_lib),
 		Cint, (),
 		)
 end
 function sqlite3_shutdown()
-	@windows_only return ccall( (:sqlite3_shutdown, sqlite3_lib), stdcall,
-			Cint, (),
-			)
-	@unix_only return ccall( (:sqlite3_shutdown, sqlite3_lib),
+	return ccall( (:sqlite3_shutdown, sqlite3_lib),
 		Cint, (),
 		)
 end
 function sqlite3_os_init()
-	@windows_only return ccall( (:sqlite3_os_init, sqlite3_lib), stdcall,
-			Cint, (),
-			)
-	@unix_only return ccall( (:sqlite3_os_init, sqlite3_lib),
+	return ccall( (:sqlite3_os_init, sqlite3_lib),
 		Cint, (),
 		)
 end
 function sqlite3_os_end()
-	@windows_only return ccall( (:sqlite3_os_end, sqlite3_lib), stdcall,
-			Cint, (),
-			)
-	@unix_only return ccall( (:sqlite3_os_end, sqlite3_lib),
+	return ccall( (:sqlite3_os_end, sqlite3_lib),
 		Cint, (),
 		)
 end
 function sqlite3_free_table(result::Array{String,1})
-	@windows_only return ccall( (:sqlite3_free_table, sqlite_lib), stdcall,
-			Void, (Ptr{Ptr{Void}},),
-			result)
-	@unix_only return ccall( (:sqlite3_free_table, sqlite_lib),
+	return ccall( (:sqlite3_free_table, sqlite_lib),
 		Void, (Ptr{Ptr{Void}},),
 		result)
 end
@@ -288,38 +198,26 @@ end
 # SQLITE_API int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
 # SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
 function sqlite3_errcode(db::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_errcode, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			db)
-	@unix_only return ccall( (:sqlite3_errcode, sqlite3_lib),
+	return ccall( (:sqlite3_errcode, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		db)
 end
 function sqlite3_extended_errcode(db::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_extended_errcode, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},),
-			db)
-	@unix_only return ccall( (:sqlite3_extended_errcode, sqlite3_lib),
+	return ccall( (:sqlite3_extended_errcode, sqlite3_lib),
 		Cint, (Ptr{Void},),
 		db)
 end
 # SQLITE_API int sqlite3_errcode(sqlite3 *db);
 # SQLITE_API int sqlite3_extended_errcode(sqlite3 *db);
 # SQLITE_API const char *sqlite3_errmsg(sqlite3*);
 function sqlite3_errmsg(db::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_errmsg, sqlite3_lib), stdcall,
-			Ptr{Uint8}, (Ptr{Void},),
-			db)
-	@unix_only return ccall( (:sqlite3_errmsg, sqlite3_lib),
+	return ccall( (:sqlite3_errmsg, sqlite3_lib),
 		Ptr{Uint8}, (Ptr{Void},),
 		db)
 end
 # SQLITE_API const void *sqlite3_errmsg16(sqlite3*);
 function sqlite3_errstr(ret::Cint)
-	@windows_only return ccall( (:sqlite3_errstr, sqlite3_lib), stdcall,
-			Ptr{Uint8}, (Cint,),
-			ret)
-	@unix_only return ccall( (:sqlite3_errstr, sqlite3_lib),
+	return ccall( (:sqlite3_errstr, sqlite3_lib),
 		Ptr{Uint8}, (Cint,),
 		ret)
 end
@@ -328,10 +226,7 @@ end
 # SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 
 function sqlite3_sql(stmt::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_sql, sqlite3_lib), stdcall,
-			Void, (Ptr{Void},),
-			stmt)
-	@unix_only return ccall( (:sqlite3_sql, sqlite3_lib),
+	return ccall( (:sqlite3_sql, sqlite3_lib),
 		Void, (Ptr{Void},),
 		stmt)
 end
@@ -343,46 +238,31 @@ end
 # SQLITE_API int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
 # SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
 function sqlite3_bind_double(stmt::Ptr{Void},col::Int,value::Float64)
-	@windows_only return ccall( (:sqlite3_bind_double, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint,Float64),
-			stmt,col,value)
-	@unix_only return ccall( (:sqlite3_bind_double, sqlite3_lib),
+	return ccall( (:sqlite3_bind_double, sqlite3_lib),
 		Cint, (Ptr{Void},Cint,Float64),
 		stmt,col,value)
 end
 # SQLITE_API int sqlite3_bind_int(sqlite3_stmt*, int, int);
 function sqlite3_bind_int(stmt::Ptr{Void},col::Int,value::Int32)
-	@windows_only return ccall( (:sqlite3_bind_int, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint,Int32),
-			stmt,col,value)
-	@unix_only return ccall( (:sqlite3_bind_int, sqlite3_lib),
+	return ccall( (:sqlite3_bind_int, sqlite3_lib),
 		Cint, (Ptr{Void},Cint,Int32),
 		stmt,col,value)
 end
 # SQLITE_API int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
 function sqlite3_bind_int64(stmt::Ptr{Void},col::Int,value::Int64)
-	@windows_only return ccall( (:sqlite3_bind_int64, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint,Int64),
-			stmt,col,value)
-	@unix_only return ccall( (:sqlite3_bind_int64, sqlite3_lib),
+	return ccall( (:sqlite3_bind_int64, sqlite3_lib),
 		Cint, (Ptr{Void},Cint,Int64),
 		stmt,col,value)
 end
 # SQLITE_API int sqlite3_bind_null(sqlite3_stmt*, int);
 function sqlite3_bind_null(stmt::Ptr{Void},col::Int)
-	@windows_only return ccall( (:sqlite3_bind_null, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint),
-			stmt,col)
-	@unix_only return ccall( (:sqlite3_bind_null, sqlite3_lib),
+	return ccall( (:sqlite3_bind_null, sqlite3_lib),
 		Cint, (Ptr{Void},Cint),
 		stmt,col)
 end
 # SQLITE_API int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int n, void(*)(void*));
 function sqlite3_bind_text(stmt::Ptr{Void},col::Int,value::String,len::Int,cb::Ptr{Void})
-	@windows_only return ccall( (:sqlite3_bind_text, sqlite3_lib), stdcall,
-			Cint, (Ptr{Void},Cint,Ptr{Uint8},Cint,Ptr{Void}),
-			stmt,col,value,len,cb)
-	@unix_only return ccall( (:sqlite3_bind_text, sqlite3_lib),
+	return ccall( (:sqlite3_bind_text, sqlite3_lib),
 		Cint, (Ptr{Void},Cint,Ptr{Uint8},Cint,Ptr{Void}),
 		stmt,col,value,len,cb)
 end