From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 1 Jan 2008 05:49:07 +0000 (+0000)
Subject: Define SQLITE_CORE=1 at the start of the amalgamation file for the benefit of any... 
X-Git-Tag: version-3.6.10~1528
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c9aaa7058edbe3408c0b048413d8568992971cd;p=thirdparty%2Fsqlite.git

Define SQLITE_CORE=1 at the start of the amalgamation file for the benefit of any extension source code (i.e. fts3) appended to it. Ticket #2858. (CVS 4649)

FossilOrigin-Name: 6dea8c16384443ed4ab59d1e2694534992ec3118
---

diff --git a/manifest b/manifest
index 52ab6598c3..824472f8f8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C fix\scase\sin\sos2GetTempname()\swhere\snone\sof\sthe\susual\senvironment\svariables\sare\sset\sto\snot\soverwrite\stwo\sunrelated\sbytes\s(CVS\s4648)
-D 2007-12-30T23:38:01
+C Define\sSQLITE_CORE=1\sat\sthe\sstart\sof\sthe\samalgamation\sfile\sfor\sthe\sbenefit\sof\sany\sextension\ssource\scode\s(i.e.\sfts3)\sappended\sto\sit.\sTicket\s#2858.\s(CVS\s4649)
+D 2008-01-01T05:49:08
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -100,7 +100,7 @@ F src/insert.c 2b145fca8e538b7f2c2de429e931c1501e55e5ac
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c 4ac53191fad2e3c4d59bde1228879b2dc5a96d66
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
-F src/loadext.c 124e566563d1c03e68e1396cb44df9870612c6e9
+F src/loadext.c d17a0f760d6866aacf5262f97d8efaaad379cdd7
 F src/main.c bdeb906fb112ff60f3612d4fd91abba05ae6d397
 F src/malloc.c 60e392a4c12c839517f9b0db7b995f825444fb35
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
@@ -532,7 +532,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl 91322dcb07dad72022bb953dd33b271528e6e843
+F tool/mksqlite3c.tcl 21605262fb98d702fbd7c64213c414bd7e60dba4
 F tool/mksqlite3internalh.tcl 47737a925fb02fce43e2c0a14b3cc17574a4d44a
 F tool/omittest.tcl 7d1fdf469e2f4d175f70c36e469db64a1626fabb
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -602,7 +602,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 6f8952a8366065c9baa48cacc9c36743788210db
-R d03bd5237ba906118a2788f23f51b499
-U pweilbacher
-Z 0ae878d989eb6f8e1b8537881b1062c2
+P 9719a063942256e34395868d974ed2d53b81b697
+R 9be79ed58ebd0f628a8fa2891c3b46c3
+U danielk1977
+Z 83c9ac93b067590bdb714d00af8d91e3
diff --git a/manifest.uuid b/manifest.uuid
index cd55bac5c8..17b2bd18b8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9719a063942256e34395868d974ed2d53b81b697
\ No newline at end of file
+6dea8c16384443ed4ab59d1e2694534992ec3118
\ No newline at end of file
diff --git a/src/loadext.c b/src/loadext.c
index dc6056299b..8293486996 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -14,7 +14,9 @@
 */
 #ifndef SQLITE_OMIT_LOAD_EXTENSION
 
-#define SQLITE_CORE 1  /* Disable the API redefinition in sqlite3ext.h */
+#ifndef SQLITE_CORE
+  #define SQLITE_CORE 1  /* Disable the API redefinition in sqlite3ext.h */
+#endif
 #include "sqlite3ext.h"
 #include "sqliteInt.h"
 #include <string.h>
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index d687f01095..d99745ca10 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -69,6 +69,7 @@ puts $out [subst \
 **
 ** This amalgamation was generated on $today.
 */
+#define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1}]
 if {$addstatic} {
   puts $out \