Skip to content

F
freeswitch
提交 08f512f4 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

update windows build to use sqlite 3.3.13 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4353 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 6461d8fa
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1902 行增加 和 1844 行删除
libs/win32/sqlite/opcodes.c
浏览文件 @ 08f512f4
...@@ -2,71 +2,71 @@ ...@@ -2,71 +2,71 @@
/* See the mkopcodec.awk script for details. */ /* See the mkopcodec.awk script for details. */
#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG) #if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
const char *const sqlite3OpcodeNames[] = { "?", const char *const sqlite3OpcodeNames[] = { "?",
/* 1 */ "VRowid", /* 1 */ "MemLoad",
/* 2 */ "VFilter", /* 2 */ "VNext",
/* 3 */ "ContextPop", /* 3 */ "Column",
/* 4 */ "IntegrityCk", /* 4 */ "SetCookie",
/* 5 */ "DropTrigger", /* 5 */ "IfMemPos",
/* 6 */ "DropIndex", /* 6 */ "Sequence",
/* 7 */ "IdxInsert", /* 7 */ "MoveGt",
/* 8 */ "Delete", /* 8 */ "RowKey",
/* 9 */ "MoveGt", /* 9 */ "OpenWrite",
/* 10 */ "OpenEphemeral", /* 10 */ "If",
/* 11 */ "VerifyCookie", /* 11 */ "Pop",
/* 12 */ "Push", /* 12 */ "VRowid",
/* 13 */ "Dup", /* 13 */ "CollSeq",
/* 14 */ "Blob", /* 14 */ "OpenRead",
/* 15 */ "FifoWrite", /* 15 */ "Expire",
/* 16 */ "Not", /* 16 */ "Not",
/* 17 */ "IdxGT", /* 17 */ "AutoCommit",
/* 18 */ "RowKey", /* 18 */ "IntegrityCk",
/* 19 */ "IsUnique", /* 19 */ "Sort",
/* 20 */ "SetNumColumns", /* 20 */ "Function",
/* 21 */ "VUpdate", /* 21 */ "Noop",
/* 22 */ "Expire", /* 22 */ "Return",
/* 23 */ "IdxIsNull", /* 23 */ "NewRowid",
/* 24 */ "NullRow", /* 24 */ "IfMemNeg",
/* 25 */ "OpenPseudo", /* 25 */ "Variable",
/* 26 */ "OpenWrite", /* 26 */ "String",
/* 27 */ "OpenRead", /* 27 */ "RealAffinity",
/* 28 */ "Transaction", /* 28 */ "ParseSchema",
/* 29 */ "AutoCommit", /* 29 */ "VOpen",
/* 30 */ "Pop", /* 30 */ "Close",
/* 31 */ "Halt", /* 31 */ "CreateIndex",
/* 32 */ "Vacuum", /* 32 */ "IsUnique",
/* 33 */ "IfMemNeg", /* 33 */ "NotFound",
/* 34 */ "RowData", /* 34 */ "Int64",
/* 35 */ "NotExists", /* 35 */ "MustBeInt",
/* 36 */ "MoveLe", /* 36 */ "Halt",
/* 37 */ "SetCookie", /* 37 */ "Rowid",
/* 38 */ "Variable", /* 38 */ "IdxLT",
/* 39 */ "VNext", /* 39 */ "AddImm",
/* 40 */ "VDestroy", /* 40 */ "Statement",
/* 41 */ "TableLock", /* 41 */ "RowData",
/* 42 */ "MemMove", /* 42 */ "MemMax",
/* 43 */ "LoadAnalysis", /* 43 */ "Push",
/* 44 */ "IdxDelete", /* 44 */ "NotExists",
/* 45 */ "Sort", /* 45 */ "MemIncr",
/* 46 */ "ResetCount", /* 46 */ "Gosub",
/* 47 */ "Integer", /* 47 */ "Integer",
/* 48 */ "AggStep", /* 48 */ "MemInt",
/* 49 */ "CreateIndex", /* 49 */ "Prev",
/* 50 */ "NewRowid", /* 50 */ "VColumn",
/* 51 */ "MoveLt", /* 51 */ "CreateTable",
/* 52 */ "Explain", /* 52 */ "Last",
/* 53 */ "Return", /* 53 */ "IdxRowid",
/* 54 */ "MemLoad", /* 54 */ "MakeIdxRec",
/* 55 */ "IdxLT", /* 55 */ "ResetCount",
/* 56 */ "Rewind", /* 56 */ "FifoWrite",
/* 57 */ "MakeIdxRec", /* 57 */ "Callback",
/* 58 */ "AddImm", /* 58 */ "ContextPush",
/* 59 */ "Null", /* 59 */ "DropTrigger",
/* 60 */ "VColumn", /* 60 */ "DropIndex",
/* 61 */ "Or", /* 61 */ "Or",
/* 62 */ "And", /* 62 */ "And",
/* 63 */ "MemNull", /* 63 */ "IdxGE",
/* 64 */ "MemIncr", /* 64 */ "IdxDelete",
/* 65 */ "Clear", /* 65 */ "Vacuum",
/* 66 */ "IsNull", /* 66 */ "IsNull",
/* 67 */ "NotNull", /* 67 */ "NotNull",
/* 68 */ "Ne", /* 68 */ "Ne",
...@@ -75,7 +75,7 @@ const char *const sqlite3OpcodeNames[] = { "?", ...@@ -75,7 +75,7 @@ const char *const sqlite3OpcodeNames[] = { "?",
/* 71 */ "Le", /* 71 */ "Le",
/* 72 */ "Lt", /* 72 */ "Lt",
/* 73 */ "Ge", /* 73 */ "Ge",
/* 74 */ "If", /* 74 */ "MoveLe",
/* 75 */ "BitAnd", /* 75 */ "BitAnd",
/* 76 */ "BitOr", /* 76 */ "BitOr",
/* 77 */ "ShiftLeft", /* 77 */ "ShiftLeft",
...@@ -86,57 +86,57 @@ const char *const sqlite3OpcodeNames[] = { "?", ...@@ -86,57 +86,57 @@ const char *const sqlite3OpcodeNames[] = { "?",
/* 82 */ "Divide", /* 82 */ "Divide",
/* 83 */ "Remainder", /* 83 */ "Remainder",
/* 84 */ "Concat", /* 84 */ "Concat",
/* 85 */ "Negative", /* 85 */ "IfNot",
/* 86 */ "RealAffinity", /* 86 */ "Negative",
/* 87 */ "BitNot", /* 87 */ "DropTable",
/* 88 */ "String8", /* 88 */ "BitNot",
/* 89 */ "Callback", /* 89 */ "String8",
/* 90 */ "AggFinal", /* 90 */ "MakeRecord",
/* 91 */ "IfMemZero", /* 91 */ "Delete",
/* 92 */ "Last", /* 92 */ "AggFinal",
/* 93 */ "Rowid", /* 93 */ "Dup",
/* 94 */ "Sequence", /* 94 */ "Goto",
/* 95 */ "NotFound", /* 95 */ "TableLock",
/* 96 */ "MakeRecord", /* 96 */ "FifoRead",
/* 97 */ "String", /* 97 */ "Clear",
/* 98 */ "Goto", /* 98 */ "IdxGT",
/* 99 */ "VCreate", /* 99 */ "MoveLt",
/* 100 */ "MemInt", /* 100 */ "VerifyCookie",
/* 101 */ "IfMemPos", /* 101 */ "AggStep",
/* 102 */ "DropTable", /* 102 */ "Pull",
/* 103 */ "IdxRowid", /* 103 */ "SetNumColumns",
/* 104 */ "Insert", /* 104 */ "AbsValue",
/* 105 */ "Column", /* 105 */ "Transaction",
/* 106 */ "Noop", /* 106 */ "VFilter",
/* 107 */ "VOpen", /* 107 */ "VDestroy",
/* 108 */ "CreateTable", /* 108 */ "ContextPop",
/* 109 */ "Found", /* 109 */ "Next",
/* 110 */ "Distinct", /* 110 */ "IdxInsert",
/* 111 */ "Close", /* 111 */ "Distinct",
/* 112 */ "Statement", /* 112 */ "Insert",
/* 113 */ "IfNot", /* 113 */ "Destroy",
/* 114 */ "Pull", /* 114 */ "ReadCookie",
/* 115 */ "VBegin", /* 115 */ "ForceInt",
/* 116 */ "MemMax", /* 116 */ "LoadAnalysis",
/* 117 */ "MemStore", /* 117 */ "Explain",
/* 118 */ "Next", /* 118 */ "IfMemZero",
/* 119 */ "Prev", /* 119 */ "OpenPseudo",
/* 120 */ "MoveGe", /* 120 */ "OpenEphemeral",
/* 121 */ "MustBeInt", /* 121 */ "Null",
/* 122 */ "ForceInt", /* 122 */ "Blob",
/* 123 */ "CollSeq", /* 123 */ "MemStore",
/* 124 */ "Gosub", /* 124 */ "Rewind",
/* 125 */ "ContextPush", /* 125 */ "MoveGe",
/* 126 */ "Real", /* 126 */ "Real",
/* 127 */ "HexBlob", /* 127 */ "HexBlob",
/* 128 */ "FifoRead", /* 128 */ "VBegin",
/* 129 */ "ParseSchema", /* 129 */ "VUpdate",
/* 130 */ "Destroy", /* 130 */ "VCreate",
/* 131 */ "IdxGE", /* 131 */ "MemMove",
/* 132 */ "ReadCookie", /* 132 */ "MemNull",
/* 133 */ "AbsValue", /* 133 */ "Found",
/* 134 */ "Function", /* 134 */ "NullRow",
/* 135 */ "Int64", /* 135 */ "NotUsed_135",
/* 136 */ "NotUsed_136", /* 136 */ "NotUsed_136",
/* 137 */ "NotUsed_137", /* 137 */ "NotUsed_137",
/* 138 */ "NotUsed_138", /* 138 */ "NotUsed_138",
......
libs/win32/sqlite/parse.c
浏览文件 @ 08f512f4
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/win32/sqlite/parse.h
浏览文件 @ 08f512f4
...@@ -82,19 +82,19 @@ ...@@ -82,19 +82,19 @@
#define TK_SLASH 82 #define TK_SLASH 82
#define TK_REM 83 #define TK_REM 83
#define TK_CONCAT 84 #define TK_CONCAT 84
#define TK_UMINUS 85 #define TK_COLLATE 85
#define TK_UPLUS 86 #define TK_UMINUS 86
#define TK_BITNOT 87 #define TK_UPLUS 87
#define TK_STRING 88 #define TK_BITNOT 88
#define TK_JOIN_KW 89 #define TK_STRING 89
#define TK_CONSTRAINT 90 #define TK_JOIN_KW 90
#define TK_DEFAULT 91 #define TK_CONSTRAINT 91
#define TK_NULL 92 #define TK_DEFAULT 92
#define TK_PRIMARY 93 #define TK_NULL 93
#define TK_UNIQUE 94 #define TK_PRIMARY 94
#define TK_CHECK 95 #define TK_UNIQUE 95
#define TK_REFERENCES 96 #define TK_CHECK 96
#define TK_COLLATE 97 #define TK_REFERENCES 97
#define TK_AUTOINCR 98 #define TK_AUTOINCR 98
#define TK_ON 99 #define TK_ON 99
#define TK_DELETE 100 #define TK_DELETE 100
......
libs/win32/sqlite/sqlite.vcproj
浏览文件 @ 08f512f4
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; type &quot;$(ProjectDir)sqlite3.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; type &quot;$(ProjectDir)parse.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; type &quot;$(ProjectDir)parse.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; type &quot;$(ProjectDir)opcodes.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; type &quot;$(ProjectDir)opcodes.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; type &quot;$(ProjectDir)keywordhash.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;" CommandLine="if exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)..\..\sqlite\src&quot;"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; type &quot;$(ProjectDir)sqlite3.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; type &quot;$(ProjectDir)parse.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; type &quot;$(ProjectDir)parse.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; type &quot;$(ProjectDir)opcodes.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; type &quot;$(ProjectDir)opcodes.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; type &quot;$(ProjectDir)keywordhash.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;" CommandLine="if exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)..\..\sqlite\src&quot;"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -153,7 +155,7 @@ ...@@ -153,7 +155,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; type &quot;$(ProjectDir)sqlite3.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; type &quot;$(ProjectDir)parse.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; type &quot;$(ProjectDir)parse.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; type &quot;$(ProjectDir)opcodes.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; type &quot;$(ProjectDir)opcodes.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; type &quot;$(ProjectDir)keywordhash.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;" CommandLine="if exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -170,6 +172,7 @@ ...@@ -170,6 +172,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)..\..\sqlite\src&quot;"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -234,7 +237,7 @@ ...@@ -234,7 +237,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; type &quot;$(ProjectDir)sqlite3.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; type &quot;$(ProjectDir)parse.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; type &quot;$(ProjectDir)parse.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; type &quot;$(ProjectDir)opcodes.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; type &quot;$(ProjectDir)opcodes.c&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; type &quot;$(ProjectDir)keywordhash.h&quot; &gt; &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;" CommandLine="if exist &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\sqlite3.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\parse.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.h&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot; del &quot;$(ProjectDir)..\..\sqlite\src\opcodes.c&quot;&#x0D;&#x0A;if exist &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot; del &quot;$(ProjectDir)..\..\sqlite\src\keywordhash.h&quot;&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -250,6 +253,7 @@ ...@@ -250,6 +253,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)..\..\sqlite\src&quot;"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -376,7 +380,7 @@ ...@@ -376,7 +380,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\opcodes.c" RelativePath=".\opcodes.c"
> >
</File> </File>
<File <File
...@@ -396,7 +400,7 @@ ...@@ -396,7 +400,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\parse.c" RelativePath=".\parse.c"
> >
</File> </File>
<File <File
...@@ -494,11 +498,11 @@ ...@@ -494,11 +498,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\keywordhash.h" RelativePath=".\keywordhash.h"
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\opcodes.h" RelativePath=".\opcodes.h"
> >
</File> </File>
<File <File
...@@ -514,11 +518,11 @@ ...@@ -514,11 +518,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\parse.h" RelativePath=".\parse.h"
> >
</File> </File>
<File <File
RelativePath="..\..\sqlite\src\sqlite3.h" RelativePath=".\sqlite3.h"
> >
</File> </File>
<File <File
......
libs/win32/sqlite/sqlite3.h
浏览文件 @ 08f512f4
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
** This header file defines the interface that the SQLite library ** This header file defines the interface that the SQLite library
** presents to client programs. ** presents to client programs.
** **
** @(#) $Id: sqlite.h.in,v 1.194 2006/09/16 21:45:14 drh Exp $ ** @(#) $Id: sqlite.h.in,v 1.198 2007/01/26 00:51:44 drh Exp $
*/ */
#ifndef _SQLITE3_H_ #ifndef _SQLITE3_H_
#define _SQLITE3_H_ #define _SQLITE3_H_
...@@ -31,7 +31,7 @@ extern "C" { ...@@ -31,7 +31,7 @@ extern "C" {
#ifdef SQLITE_VERSION #ifdef SQLITE_VERSION
# undef SQLITE_VERSION # undef SQLITE_VERSION
#endif #endif
#define SQLITE_VERSION "3.3.8" #define SQLITE_VERSION "3.3.13"
/* /*
** The format of the version string is "X.Y.Z<trailing string>", where ** The format of the version string is "X.Y.Z<trailing string>", where
...@@ -48,7 +48,7 @@ extern "C" { ...@@ -48,7 +48,7 @@ extern "C" {
#ifdef SQLITE_VERSION_NUMBER #ifdef SQLITE_VERSION_NUMBER
# undef SQLITE_VERSION_NUMBER # undef SQLITE_VERSION_NUMBER
#endif #endif
#define SQLITE_VERSION_NUMBER 3003008 #define SQLITE_VERSION_NUMBER 3003013
/* /*
** The version string is also compiled into the library so that a program ** The version string is also compiled into the library so that a program
...@@ -125,7 +125,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ...@@ -125,7 +125,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
** value then the query is aborted, all subsequent SQL statements ** value then the query is aborted, all subsequent SQL statements
** are skipped and the sqlite3_exec() function returns the SQLITE_ABORT. ** are skipped and the sqlite3_exec() function returns the SQLITE_ABORT.
** **
** The 4th parameter is an arbitrary pointer that is passed ** The 1st parameter is an arbitrary pointer that is passed
** to the callback function as its first parameter. ** to the callback function as its first parameter.
** **
** The 2nd parameter to the callback function is the number of ** The 2nd parameter to the callback function is the number of
...@@ -315,13 +315,30 @@ int sqlite3_complete16(const void *sql); ...@@ -315,13 +315,30 @@ int sqlite3_complete16(const void *sql);
** currently locked by another process or thread. If the busy callback ** currently locked by another process or thread. If the busy callback
** is NULL, then sqlite3_exec() returns SQLITE_BUSY immediately if ** is NULL, then sqlite3_exec() returns SQLITE_BUSY immediately if
** it finds a locked table. If the busy callback is not NULL, then ** it finds a locked table. If the busy callback is not NULL, then
** sqlite3_exec() invokes the callback with three arguments. The ** sqlite3_exec() invokes the callback with two arguments. The
** second argument is the name of the locked table and the third ** first argument to the handler is a copy of the void* pointer which
** argument is the number of times the table has been busy. If the ** is the third argument to this routine. The second argument to
** the handler is the number of times that the busy handler has
** been invoked for this locking event. If the
** busy callback returns 0, then sqlite3_exec() immediately returns ** busy callback returns 0, then sqlite3_exec() immediately returns
** SQLITE_BUSY. If the callback returns non-zero, then sqlite3_exec() ** SQLITE_BUSY. If the callback returns non-zero, then sqlite3_exec()
** tries to open the table again and the cycle repeats. ** tries to open the table again and the cycle repeats.
** **
** The presence of a busy handler does not guarantee that
** it will be invoked when there is lock contention.
** If SQLite determines that invoking the busy handler could result in
** a deadlock, it will return SQLITE_BUSY instead.
** Consider a scenario where one process is holding a read lock that
** it is trying to promote to a reserved lock and
** a second process is holding a reserved lock that it is trying
** to promote to an exclusive lock. The first process cannot proceed
** because it is blocked by the second and the second process cannot
** proceed because it is blocked by the first. If both processes
** invoke the busy handlers, neither will make any progress. Therefore,
** SQLite returns SQLITE_BUSY for the first process, hoping that this
** will induce the first process to release its read lock and allow
** the second process to proceed.
**
** The default busy callback is NULL. ** The default busy callback is NULL.
** **
** Sqlite is re-entrant, so the busy handler may start a new query. ** Sqlite is re-entrant, so the busy handler may start a new query.
...@@ -692,6 +709,31 @@ int sqlite3_prepare16( ...@@ -692,6 +709,31 @@ int sqlite3_prepare16(
const void **pzTail /* OUT: Pointer to unused portion of zSql */ const void **pzTail /* OUT: Pointer to unused portion of zSql */
); );
/*
** Newer versions of the prepare API work just like the legacy versions
** but with one exception: The a copy of the SQL text is saved in the
** sqlite3_stmt structure that is returned. If this copy exists, it
** modifieds the behavior of sqlite3_step() slightly. First, sqlite3_step()
** will no longer return an SQLITE_SCHEMA error but will instead automatically
** rerun the compiler to rebuild the prepared statement. Secondly,
** sqlite3_step() now turns a full result code - the result code that
** use used to have to call sqlite3_reset() to get.
*/
int sqlite3_prepare_v2(
sqlite3 *db, /* Database handle */
const char *zSql, /* SQL statement, UTF-8 encoded */
int nBytes, /* Length of zSql in bytes. */
sqlite3_stmt **ppStmt, /* OUT: Statement handle */
const char **pzTail /* OUT: Pointer to unused portion of zSql */
);
int sqlite3_prepare16_v2(
sqlite3 *db, /* Database handle */
const void *zSql, /* SQL statement, UTF-16 encoded */
int nBytes, /* Length of zSql in bytes. */
sqlite3_stmt **ppStmt, /* OUT: Statement handle */
const void **pzTail /* OUT: Pointer to unused portion of zSql */
);
/* /*
** Pointers to the following two opaque structures are used to communicate ** Pointers to the following two opaque structures are used to communicate
** with the implementations of user-defined functions. ** with the implementations of user-defined functions.
...@@ -1143,9 +1185,13 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*)); ...@@ -1143,9 +1185,13 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*));
** SQLITE_TRANSIENT value means that the content will likely change in ** SQLITE_TRANSIENT value means that the content will likely change in
** the near future and that SQLite should make its own private copy of ** the near future and that SQLite should make its own private copy of
** the content before returning. ** the content before returning.
**
** The typedef is necessary to work around problems in certain
** C++ compilers. See ticket #2191.
*/ */
#define SQLITE_STATIC ((void(*)(void *))0) typedef void (*sqlite3_destructor_type)(void*);
#define SQLITE_TRANSIENT ((void(*)(void *))-1) #define SQLITE_STATIC ((sqlite3_destructor_type)0)
#define SQLITE_TRANSIENT ((sqlite3_destructor_type)-1)
/* /*
** User-defined functions invoke the following routines in order to ** User-defined functions invoke the following routines in order to
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论