Remove an extra space before function names in the amalgamation. Cherrypick of ...

FossilOrigin-Name: a04a21ad5aa1a56d50388d6cdb88bae754218a0a

diff --git a/manifest b/manifest
index ca7b2579c29093202547a1b5e380929023901f33..49ad24a115ec37b1925c33d905a68e462adbc24b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite3_trace_v2()\sinterface\sso\sthat\sit\sgoes\sdisabled\sif\seither\sthe\scallback\sor\smask\sarguments\sare\szero,\sin\saccordance\swith\sthe\sdocumentation.\s\sCherrypick\sof\s[37e6c54b1afc6348].
-D 2016-09-07T20:12:34.171
+C Remove\san\sextra\sspace\sbefore\sfunction\snames\sin\sthe\samalgamation.\s\sCherrypick\sof\s[20f3c7436f6a8a7bab39].
+D 2016-09-08T23:18:34.912
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6fef1e10792656c94fe1393092de6c8ba6ea1c88
@@ -1449,9 +1449,9 @@ F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c-noext.tcl e241889b12b7f857bc7c361776ef113d826e0c28
-F tool/mksqlite3c.tcl b076d24348a84dffd41aab01bc4e19a1ba17581a
-F tool/mksqlite3h.tcl 22fa51b3dc04bef7cc55546c94b8b05478e081f8
+F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
+F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
+F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@ -1509,8 +1509,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c844f3daa9173badf476c56ca00284dbbac853d3
-Q +37e6c54b1afc634844026b3fe874dd2d550c6558
-R fc371e43e3f4b7352f443d9dd6d62e30
+P e9acf6161353bc8d79a07d4b58f86794a7b340f4
+Q +20f3c7436f6a8a7bab3968adc010c7c8325e4618
+R 073817cadc2d2cf4f1a705c7b7ab3a16
 U mistachkin
-Z 42e4da574fefc86caac5d42ce718786c
+Z a78ed2da02879df285bfdd9cde950ff3

diff --git a/manifest.uuid b/manifest.uuid
index bbbab7cb14a7b013cfde8f00d2585ef17b2d98f8..9dceccdc430f98c53ffa49553e037e690d0f3fdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e9acf6161353bc8d79a07d4b58f86794a7b340f4
\ No newline at end of file
+a04a21ad5aa1a56d50388d6cdb88bae754218a0a
\ No newline at end of file

diff --git a/tool/mksqlite3c-noext.tcl b/tool/mksqlite3c-noext.tcl
index a55e93ff165049ae5659358ab96b6b097a92abf2..a16b0591eb547e61b6270def640f57aaba3fbf0f 100644 (file)
--- a/tool/mksqlite3c-noext.tcl
+++ b/tool/mksqlite3c-noext.tcl
@@ -226,12 +226,12 @@ proc copy_file {filename} {
           }
           if {$useapicall} {
             if {[lsearch -exact $cdecllist $funcname] >= 0} {
-              append line SQLITE_CDECL
+              append line SQLITE_CDECL " "
             } else {
-              append line SQLITE_APICALL
+              append line SQLITE_APICALL " "
             }
           }
-          append line " " $funcname $rest
+          append line $funcname $rest
           puts $out $line
         } else {
           puts $out "SQLITE_PRIVATE $line"

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 9938ed14e46c22c19557f2388ba774da38cb49ae..55179c4b80b1988462c31cfd224b48af5e7cda10 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -234,12 +234,12 @@ proc copy_file {filename} {
           }
           if {$useapicall} {
             if {[lsearch -exact $cdecllist $funcname] >= 0} {
-              append line SQLITE_CDECL
+              append line SQLITE_CDECL " "
             } else {
-              append line SQLITE_APICALL
+              append line SQLITE_APICALL " "
             }
           }
-          append line " " $funcname $rest
+          append line $funcname $rest
           puts $out $line
         } else {
           puts $out "SQLITE_PRIVATE $line"

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index c620eb630da72b6c412cc6ec78a1d99b4bf64eef..4f8a1fd49700aa49380647ee9644fa1d73529b60 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -129,12 +129,12 @@ foreach file $filelist {
         }
         if {$useapicall} {
           if {[lsearch -exact $cdecllist $funcname] >= 0} {
-            append line SQLITE_CDECL
+            append line SQLITE_CDECL " "
           } else {
-            append line SQLITE_APICALL
+            append line SQLITE_APICALL " "
           }
         }
-        append line " " $funcname $rest
+        append line $funcname $rest
       }
     }
     if {$useapicall} {