From: drh <drh@noemail.net>
Date: Sat, 24 Mar 2018 00:19:18 +0000 (+0000)
Subject: Prepend linkage macros to the sqlite3rebaser interfaces.
X-Git-Tag: version-3.23.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b873f4e404e9205209b279827ad49eac11dfadbb;p=thirdparty%2Fsqlite.git

Prepend linkage macros to the sqlite3rebaser interfaces.

FossilOrigin-Name: c64e8f377fe4fa321ebd04806cc27b19287e6fc3523b9988c0a70cad9fce1c18
---

diff --git a/manifest b/manifest
index 726258c0a7..7a73eed617 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\ssqlite3session.h\spreventing\sdocumentation\swebpages\sfrom\sbeing\ngenerated.\sAlso\smark\sall\snew\ssessions\sfunctions\s(those\srelated\sto\srebasing)\sas\nexperimental.
-D 2018-03-23T17:36:31.260
+C Prepend\slinkage\smacros\sto\sthe\ssqlite3rebaser\sinterfaces.
+D 2018-03-24T00:19:18.417
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1656,7 +1656,7 @@ F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b6074
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 F tool/mksqlite3c.tcl a03cee30de81a2e67b93e5c659f24113a003677c557daeb008205c8e6d4345d6
-F tool/mksqlite3h.tcl f92f994d9709aeb9e2b6e6f9fc8b069d2f55202c8e23f453edc44390a25982dc
+F tool/mksqlite3h.tcl 080873e3856eceb9d289a08a00c4b30f875ea3feadcbece796bd509b1532792c
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@ -1717,7 +1717,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 0b06ce6d8e7cff5cd5d467a94522dfef5593d7c26663ce03c2c2b663a2641551
-R ee50f1cd31ab90aa2bc35de099ffed2c
-U dan
-Z ea119ad03ada267ffb29194d81f0e0ba
+P de974235a8fefab0d08673c1b1da4e425e1d8bbfc8c35dac30943c05337b2950
+R d4bdb1788d4d4dfb03fac1718122533d
+U drh
+Z 6b81992f6d9930cde8e20b5fb53471c1
diff --git a/manifest.uuid b/manifest.uuid
index 1aca0cb8a4..99df632900 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de974235a8fefab0d08673c1b1da4e425e1d8bbfc8c35dac30943c05337b2950
\ No newline at end of file
+c64e8f377fe4fa321ebd04806cc27b19287e6fc3523b9988c0a70cad9fce1c18
\ No newline at end of file
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 5b4c48bb74..216bd4e60b 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -72,6 +72,9 @@ set declpattern3 \
 set declpattern4 \
     {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3changegroup_[_a-zA-Z0-9]+)(\(.*)$}
 
+set declpattern5 \
+    {^ *([a-zA-Z][a-zA-Z_0-9 ]+ \**)(sqlite3rebaser_[_a-zA-Z0-9]+)(\(.*)$}
+
 # Force the output to use unix line endings, even on Windows.
 fconfigure stdout -translation lf
 
@@ -121,7 +124,8 @@ foreach file $filelist {
       if {[regexp $declpattern1 $line all rettype funcname rest] || \
           [regexp $declpattern2 $line all rettype funcname rest] || \
           [regexp $declpattern3 $line all rettype funcname rest] || \
-          [regexp $declpattern4 $line all rettype funcname rest]} {
+          [regexp $declpattern4 $line all rettype funcname rest] || \
+          [regexp $declpattern5 $line all rettype funcname rest]} {
         set line SQLITE_API
         append line " " [string trim $rettype]
         if {[string index $rettype end] ne "*"} {