Merge branch 'master' of github.com:dnet/erlang-sqlite3 into dnet-master

Conflicts:
	c_src/sqlite3_drv.c
This commit is contained in:
Alexey Romanov
2014-10-10 00:36:56 +04:00
2 changed files with 13 additions and 12 deletions

View File

@@ -97,8 +97,8 @@ typedef struct async_sqlite3_command {
static ErlDrvData start(ErlDrvPort port, char* cmd);
static void stop(ErlDrvData handle);
static int control(ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen);
static ErlDrvSSizeT control(ErlDrvData drv_data, unsigned int command, char *buf,
ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen);
static int sql_exec(sqlite3_drv_t *drv, char *buf, int len);
static int sql_bind_and_exec(sqlite3_drv_t *drv, char *buf, int len);
static int sql_exec_script(sqlite3_drv_t *drv, char *buf, int len);