From: dan Date: Mon, 30 Jan 2017 11:38:19 +0000 (+0000) Subject: Fix building with SQLITE_OMIT_FOREIGN_KEY defined. X-Git-Tag: version-3.17.0~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7eeeb99f7827fc2838cf730adfb58f5419a41e7;p=thirdparty%2Fsqlite.git Fix building with SQLITE_OMIT_FOREIGN_KEY defined. FossilOrigin-Name: e93d2c49a44af994ff10cc9cc7eafacd5a4f73ab --- diff --git a/manifest b/manifest index 332ad282a9..229623bcc5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sthe\samalgamation,\sallocate\sthe\sparser\sengine\sobject\sfrom\sstack\srather\sthan\nfrom\sheap,\sfor\simproved\sperformance.\s\sThis\sonly\shappens\sin\sthe\samalgamation,\nsince\sotherwise\sthe\ssqlite3RunParser()\sroutine\sdoes\snot\sknow\sthe\sobject\ssize. -D 2017-01-28T20:46:37.958 +C Fix\sbuilding\swith\sSQLITE_OMIT_FOREIGN_KEY\sdefined. +D 2017-01-30T11:38:19.468 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -396,7 +396,7 @@ F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19 F src/sqlite.h.in 8fd2b1a4e4aac023d4533313442528b81105fab3 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h fd6815792077b7dc69f5167117cc5727fe95ed5a +F src/sqliteInt.h 6f29b23415ce207c2fda61054bf244b74f96359c F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -1548,7 +1548,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 2a2e7d86b275c970726f642a37a098950a3b906e -R 9e84d1f95c544016e0312212ee6f639c -U drh -Z 9df531d71c0beb5e9e8a394dca7276a3 +P 4fe879d4b5da6ae0688a7a99004683a234966597 +R c0ed5c24fdff676195cd77401e89700b +U dan +Z 6d1b138d17ccacee0c622f2ed331ca89 diff --git a/manifest.uuid b/manifest.uuid index 87236c5ed3..eec33fc0a4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4fe879d4b5da6ae0688a7a99004683a234966597 \ No newline at end of file +e93d2c49a44af994ff10cc9cc7eafacd5a4f73ab \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 4b7bdf5937..4a28ebcd5a 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -4186,6 +4186,7 @@ const char *sqlite3JournalModename(int); #define sqlite3FkDropTable(a,b,c) #define sqlite3FkOldmask(a,b) 0 #define sqlite3FkRequired(a,b,c,d) 0 + #define sqlite3FkReferences(a) 0 #endif #ifndef SQLITE_OMIT_FOREIGN_KEY void sqlite3FkDelete(sqlite3 *, Table*);