aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormihailim <mihailim@noemail.net>2008-06-23 11:23:14 +0000
committermihailim <mihailim@noemail.net>2008-06-23 11:23:14 +0000
commitbda2e62c55ad4aa2f88df504f18315d346601110 (patch)
tree1c605d6533a2c8499af43a0e512b4398aefa393b /src
parent8468024da8188db7fcc9aed9220597f7e9009a16 (diff)
downloadsqlite-bda2e62c55ad4aa2f88df504f18315d346601110.tar.gz
sqlite-bda2e62c55ad4aa2f88df504f18315d346601110.zip
Fixed wrong type in sqlite3_create_collation16 declaration and definition (UTF-16 string had been passed as const char* instead of const void*) (CVS 5276)
FossilOrigin-Name: 4215e3e5ae3376bd46e5e12eec14b8209c164830
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
-rw-r--r--src/sqlite.h.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 49d9d0cab..5a69b9d0c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: main.c,v 1.456 2008/06/23 09:50:51 danielk1977 Exp $
+** $Id: main.c,v 1.457 2008/06/23 11:23:14 mihailim Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -1487,7 +1487,7 @@ int sqlite3_create_collation_v2(
*/
int sqlite3_create_collation16(
sqlite3* db,
- const char *zName,
+ const void *zName,
int enc,
void* pCtx,
int(*xCompare)(void*,int,const void*,int,const void*)
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ef0912556..874b6e889 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
**
-** @(#) $Id: sqlite.h.in,v 1.352 2008/06/22 16:35:49 mihailim Exp $
+** @(#) $Id: sqlite.h.in,v 1.353 2008/06/23 11:23:14 mihailim Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -4436,7 +4436,7 @@ int sqlite3_create_collation_v2(
);
int sqlite3_create_collation16(
sqlite3*,
- const char *zName,
+ const void *zName,
int eTextRep,
void*,
int(*xCompare)(void*,int,const void*,int,const void*)