Get SQLLOG working on windows. Fix a couple of compiler warnings.

FossilOrigin-Name: b3809c937b230b34e5bc6ce4909c04ceef72fb85

diff --git a/manifest b/manifest
index 3de91a4d81019a1d8e7ccd344cf8ef44ff01d316..dcae596364d188a5c5e218317d865aa041be8922 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\sin\stest_sqllog.c.\sClarify\sthe\sexperimental\sSQLITE_CONFIG_SQLLOG\sinterface.\sHandle\sat\sleast\sthe\smore\slikely\serror\sconditions\sin\stest_sqllog.c.
-D 2012-11-27T10:56:39.734
+C Get\sSQLLOG\sworking\son\swindows.\s\sFix\sa\scouple\sof\scompiler\swarnings.
+D 2012-11-27T16:39:31.650
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
 F src/test_spellfix.c 76dd8d3111d2f5354c374f71fa23b752bd0b029c
-F src/test_sqllog.c 426eb95f41d06f9a45af6cb58f80f516434edc9d
+F src/test_sqllog.c 7813b47021a6d4e39bb7b1b328a8893dc59885cb
 F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
@@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P cd501bbccf3e62b002317592cc331770b32c129a
-R ad919a174cc92f00b19fd1b031dd4d29
-U dan
-Z 5c76c382e687bb7efe7c77eaf9918880
+P 429c5b2056d7b7c644ca53bc97b8e0b9cb89ab04
+R 80bd85027f5a447d832a60beb6eca377
+U drh
+Z 7ed00ed04a2be724512bb24e3fa5a2b6

diff --git a/manifest.uuid b/manifest.uuid
index ae47c04099c04158f76bfb5d50f3be86c7d29ae5..8592a4a12d9e98fb32ded38431b34d23645e65e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-429c5b2056d7b7c644ca53bc97b8e0b9cb89ab04
\ No newline at end of file
+b3809c937b230b34e5bc6ce4909c04ceef72fb85
\ No newline at end of file

diff --git a/src/test_sqllog.c b/src/test_sqllog.c
index 52aa3a63265151e63e9fdaf09f290895882b8605..49569a39fb1257e517c3e222f89f9ab47fa1d5f4 100644 (file)
--- a/src/test_sqllog.c
+++ b/src/test_sqllog.c
@@ -66,7 +66,11 @@
 #include "sys/types.h"
 #include "unistd.h"
 static int getProcessId(void){
+#if SQLITE_OS_WIN
+  return (int)_getpid();
+#else
   return (int)getpid();
+#endif
 }
 
 
@@ -210,14 +214,14 @@ static int sqllogFindAttached(
   rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
   if( rc==SQLITE_OK ){
     while( SQLITE_ROW==sqlite3_step(pStmt) ){
-      char *zVal1; int nVal1;
-      char *zVal2; int nVal2;
+      const char *zVal1; int nVal1;
+      const char *zVal2; int nVal2;
 
-      zVal1 = sqlite3_column_text(pStmt, 1);
+      zVal1 = (const char*)sqlite3_column_text(pStmt, 1);
       nVal1 = sqlite3_column_bytes(pStmt, 1);
       memcpy(zName, zVal1, nVal1+1);
 
-      zVal2 = sqlite3_column_text(pStmt, 2);
+      zVal2 = (const char*)sqlite3_column_text(pStmt, 2);
       nVal2 = sqlite3_column_bytes(pStmt, 2);
       memcpy(zFile, zVal2, nVal2+1);
 
@@ -466,4 +470,3 @@ void sqlite3_init_sqllog(void){
     }
   }
 }
-