Further simplifications to the amalgamation builder.

FossilOrigin-Name: e826cd7db6b3ab010533d81a759794c2470343d2

diff --git a/manifest b/manifest
index 8d1f543c393929f8f1cacf197708aca00e477b43..6b34425f062239d85b72c18ab473baca36f52e1f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\s'mksqlite3c-noext'\stool\sas\swell.
-D 2015-03-24T21:52:12.248
+C Further\ssimplifications\sto\sthe\samalgamation\sbuilder.
+D 2015-03-24T21:54:42.913
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -232,7 +232,7 @@ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
 F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
-F src/sqlite.h.in 82977ae32ba5f5a115d4434418087c9c1088f643
+F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33
@@ -1212,9 +1212,9 @@ F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c-noext.tcl 46dad185f91829a25b10291b244d2440ad4a88f4
-F tool/mksqlite3c.tcl ab2cfb2191f1edaea0e72b6ad3bc3f71aa61a6b9
-F tool/mksqlite3h.tcl c02e391f595bf91528341ffaa53e5084d8b595ce
+F tool/mksqlite3c-noext.tcl 274d4243bd7c8b5b280a02ec50280d73f80a9d89
+F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c
+F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 242f09d4d1c92ee9058857a5e780442f4b7bad55
-R 4e80129117aa4b372475de5cd1490c7f
-U mistachkin
-Z 6bcda5d8184063ac5fc3f1cb05a00dcd
+P a532256688c3a7a6385e041ec73913842e2c3ab3
+R 82569f0fcef6344e8c55e30ea4294bbd
+U drh
+Z 70d7caefbc05dc10c257a925b1d49a53

diff --git a/manifest.uuid b/manifest.uuid
index 52602f40c4f38d2bc9a71a0a3b8818687a7480ad..ae9df8a883df80375cef78d5a77ca1567338dd52 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a532256688c3a7a6385e041ec73913842e2c3ab3
\ No newline at end of file
+e826cd7db6b3ab010533d81a759794c2470343d2
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6d2cc146dcdbfd8417e14cbc1c325925e26aa47b..acc3c51404d045a91c5b5c8fa5c32d4b8a3ded3f 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -43,11 +43,20 @@ extern "C" {
 
 
 /*
-** Add the ability to override 'extern'
+** Provide the ability to override linkage features of the interface.
 */
 #ifndef SQLITE_EXTERN
 # define SQLITE_EXTERN extern
 #endif
+#ifndef SQLITE_API
+# define SQLITE_API
+#endif
+#ifndef SQLITE_CDECL
+# define SQLITE_CDECL
+#endif
+#ifndef SQLITE_STDCALL
+# define SQLITE_STDCALL
+#endif
 
 /*
 ** These no-op macros are used in front of interfaces to mark those

diff --git a/tool/mksqlite3c-noext.tcl b/tool/mksqlite3c-noext.tcl
index 35c14093e94c1b8f4ed184de649025ccaf118b36..24462fc29ef51289fc3e935d472a8b4ed97836cc 100644 (file)
--- a/tool/mksqlite3c-noext.tcl
+++ b/tool/mksqlite3c-noext.tcl
@@ -80,15 +80,6 @@ if {$addstatic} {
   puts $out \
 {#ifndef SQLITE_PRIVATE
 # define SQLITE_PRIVATE static
-#endif
-#ifndef SQLITE_API
-# define SQLITE_API
-#endif
-#ifndef SQLITE_CDECL
-# define SQLITE_CDECL
-#endif
-#ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL
 #endif}
 }
 

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index b33eef8f1aa8d814f1a1a652a506bbeeccc1fefe..136155089ca5a335e5eccc2cf4a04a9ec412ce77 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -80,15 +80,6 @@ if {$addstatic} {
   puts $out \
 {#ifndef SQLITE_PRIVATE
 # define SQLITE_PRIVATE static
-#endif
-#ifndef SQLITE_API
-# define SQLITE_API
-#endif
-#ifndef SQLITE_CDECL
-# define SQLITE_CDECL
-#endif
-#ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL
 #endif}
 }
 

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 9ed74c3f4b115cdde726c98cb469efc3f2d586e9..cabce1f50b7e053a7771c4af395678bf607d6cc1 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -102,25 +102,7 @@ foreach file $filelist {
     regsub -- --VERS--           $line $zVersion line
     regsub -- --VERSION-NUMBER-- $line $nVersion line
     regsub -- --SOURCE-ID--      $line "$zDate $zUuid" line
-  
-    if {[regexp {define SQLITE_EXTERN extern} $line]} {
-      puts $line
-      puts [gets $in]
-      puts ""
-      puts "#ifndef SQLITE_API"
-      puts "# define SQLITE_API"
-      puts "#endif"
-      puts ""
-      puts "#ifndef SQLITE_CDECL"
-      puts "# define SQLITE_CDECL"
-      puts "#endif"
-      puts ""
-      puts "#ifndef SQLITE_STDCALL"
-      puts "# define SQLITE_STDCALL"
-      puts "#endif"
-      set line ""
-    }
-  
+
     if {[regexp $varpattern $line] && ![regexp {^ *typedef} $line]} {
       set line "SQLITE_API $line"
     } else {