From: drh <drh@noemail.net>
Date: Fri, 14 Aug 2009 18:18:03 +0000 (+0000)
Subject: Update the amalgamation builder so that it avoids putting redundant
X-Git-Tag: fts3-refactor~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c50f7fedfa98ced1963f4804d83ab71168ecde;p=thirdparty%2Fsqlite.git

Update the amalgamation builder so that it avoids putting redundant
SQLITE_API macros on declarations.

FossilOrigin-Name: 0d5b058717858c9cda8ca120a3d814453a94a0e6
---

diff --git a/manifest b/manifest
index 7e4ba89e05..63dec38152 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Work\saround\san\sover-zealous\soptimization\sin\sGCC\s4.3.3.\sSee\nCVSTrac\sticket\s#4027.
-D 2009-08-14T17:53:39
+C Update\sthe\samalgamation\sbuilder\sso\sthat\sit\savoids\sputting\sredundant\nSQLITE_API\smacros\son\sdeclarations.
+D 2009-08-14T18:18:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -730,7 +730,7 @@ F tool/lempar.c 2ed70b3fc896a47e07fedfe543324f008f53d223
 F tool/mkkeywordhash.c 511a848b2ac7a3d93f36adc1e1086b4c5741224b
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl b790a58c9971e3ace07e92cab5604fec8849fa23
+F tool/mksqlite3c.tcl 9aea914126a7c938e92f1176d77b111c11c7a956
 F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
@@ -746,14 +746,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 43321a556031942389ca11b033c1eae46ac6141b
-R eb2beaf54103dc01ac5b253ec6add39c
+P 9cbe3654055a78c09ea1ecd5dc599bcd888b57e3
+R 9142cd5088584d6322dd160e9df9a386
 U drh
-Z 9a01aa6fc3a050aa76e3a8e84bdd68fb
+Z 2a7604fcf5cc328cdfa6d300890f778c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFKhaSnoxKgR168RlERAjFRAJ9mnEDWyq0jZnL+V4BV6BYX1aQUPgCcDqZL
-lQjS60b3gaHbvLqqZPVoylo=
-=S0NM
+iD8DBQFKhapgoxKgR168RlERAkH2AJoC/gxQtUL74VspfOFK2+qp6iCVFQCfRUDA
+GwXZvHleDts/BZKq+4hsve0=
+=Wsj5
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 7615f8f0e2..82fd998483 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9cbe3654055a78c09ea1ecd5dc599bcd888b57e3
\ No newline at end of file
+0d5b058717858c9cda8ca120a3d814453a94a0e6
\ No newline at end of file
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index fbe3e12005..5a66e0443c 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -166,6 +166,7 @@ proc copy_file {filename} {
     } elseif {[regexp {^#line} $line]} {
       # Skip #line directives.
     } elseif {$addstatic && ![regexp {^(static|typedef)} $line]} {
+      regsub {^SQLITE_API } $line {} line
       if {[regexp $declpattern $line all funcname]} {
         # Add the SQLITE_PRIVATE or SQLITE_API keyword before functions.
         # so that linkage can be modified at compile-time.
@@ -304,4 +305,3 @@ foreach file {
 }
 
 close $out
-