Replace SQLITE_EXTERN with SQLITE_API in exported variables when generating

the amalgamation.  Should fix #2982 (CVS 4845)

FossilOrigin-Name: f134c282ea841fe35f322a1f8c326242c6ad7b24

diff --git a/manifest b/manifest
index 709bb7193b08fbe92a6415d6f432cdffb261146c..2a9501e235c968a9485cdb0a1b4284343353244e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarify\sthe\slanguage\sin\sthe\ssqlite3_create_function()\sdocumentation.\nTicket\s#2980.\s(CVS\s4844)
-D 2008-03-08T12:37:31
+C Replace\sSQLITE_EXTERN\swith\sSQLITE_API\sin\sexported\svariables\swhen\sgenerating\nthe\samalgamation.\s\sShould\sfix\s#2982\s(CVS\s4845)
+D 2008-03-09T01:14:42
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in d521464011d6965bbda1b699f1850c6e33141c73
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -553,7 +553,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 7184e0648b361230ec8bf87f5c1a5ad7e1e214e9
+F tool/mksqlite3c.tcl feb1cf30c5e560cbdd06522affb0b4eb4c9b6e6e
 F tool/mksqlite3internalh.tcl 47737a925fb02fce43e2c0a14b3cc17574a4d44a
 F tool/omittest.tcl 7d1fdf469e2f4d175f70c36e469db64a1626fabb
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 788b2c6b537809a496bf30550a12e743c1697eb7
-R 42e58aaa9e82db0d60a7d5fb1cd58f74
-U drh
-Z 3b84cfb1e1199a74209324686efe968d
+P 2db43738bfcd2db29167ff02f4291e74324225d7
+R fb841dfcda6d1a0d05bee7105302b4c8
+U mlcreech
+Z 3ad0903ec0700d3cf59532ddb2d43fdb

diff --git a/manifest.uuid b/manifest.uuid
index 2b2539f9ad67c4f7066fd07f0c647507ddf07711..10da734896e92c69a2896bdfcccdd33ab9ada93a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2db43738bfcd2db29167ff02f4291e74324225d7
\ No newline at end of file
+f134c282ea841fe35f322a1f8c326242c6ad7b24
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index df7a03103a5d17debc78584d1ff73139eebacd6f..00a4e8d060fc87be71a8b68d99beacbcf2594a57 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -176,10 +176,9 @@ proc copy_file {filename} {
         if {![regexp {^sqlite3_} $varname]} {
           regsub {^extern } $line {} line
           puts $out "SQLITE_PRIVATE $line"
-        } elseif {![regexp {^SQLITE_EXTERN} $line]} {
-          puts $out "SQLITE_API $line"
         } else {
-          puts $out $line
+          regsub {^SQLITE_EXTERN } $line {} line
+          puts $out "SQLITE_API $line"
         }
       } elseif {[regexp {^(SQLITE_EXTERN )?void \(\*sqlite3IoTrace\)} $line]} {
         regsub {^SQLITE_EXTERN } $line {} line