Add a special rule to the amalgamation generator to deal with

the sqlite3OsDlSym function.  Ticket #3631. (CVS 6236)

FossilOrigin-Name: 876f874c6e2e6e7763083e6761eedc10a4522ec9

diff --git a/manifest b/manifest
index fa759ef1f7cf42042ded0408bfc97a0a40e9aeeb..3c05708a762976c7500f3819a096d9a0a8e9ab6d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\scheck-in\s(6226)\swhich\scould\scause\san\sassertion\sfault\nfollowing\sa\smalloc\sfailure.\s\sThe\sprior\scheck-in\swas\sfor\sticket\s#3624.\s(CVS\s6235)
-D 2009-02-03T13:19:12
+C Add\sa\sspecial\srule\sto\sthe\samalgamation\sgenerator\sto\sdeal\swith\nthe\ssqlite3OsDlSym\sfunction.\s\sTicket\s#3631.\s(CVS\s6236)
+D 2009-02-03T13:51:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 3871d308188cefcb7c5ab20da4c7b6aad023bc52
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -681,7 +681,7 @@ F tool/lempar.c aeba88b8566ff66f8a67c96b3eb2dd95e7d8908d
 F tool/mkkeywordhash.c 8e57fbe8c4fe2f1800f9190fd361231cb8558407
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl bc7c626adfca5aa022454a411a62e81e7204339e
+F tool/mksqlite3c.tcl d4668afb9b48533eed969c98787fea9a3d07b565
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -695,7 +695,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cd2e7f6c0fe4c0c648f8ca21388ab0769164f5ef
-R 718fa0ce1dbfbe9a12df42e906ac913f
+P 1ffe44e9d6b49346a75850a977953de12c127069
+R 35f24f396c22640dc5d33d1ae8df531a
 U drh
-Z 05b85b03f1d86246b1ba23cf33a374f3
+Z a395923455cb532eb6d33af3163637d2

diff --git a/manifest.uuid b/manifest.uuid
index c9052ada0f287e0d3cdc0440c0d56f1253d59340..aaa5b7a5f77014cbc4f9220061e599a2fd09fd07 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ffe44e9d6b49346a75850a977953de12c127069
\ No newline at end of file
+876f874c6e2e6e7763083e6761eedc10a4522ec9
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 21cb3f874f06712c4730d7ea5fabeeaf48414e69..1be74093fb435fd867085343859af01df312e349 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -190,6 +190,8 @@ proc copy_file {filename} {
       } elseif {[regexp {^(SQLITE_EXTERN )?void \(\*sqlite3IoTrace\)} $line]} {
         regsub {^SQLITE_EXTERN } $line {} line
         puts $out "SQLITE_PRIVATE $line"
+      } elseif {[regexp {^void \(\*sqlite3Os} $line]} {
+        puts $out "SQLITE_PRIVATE $line"
       } else {
         puts $out $line
       }