Thanks Dan, that fixed it. Also, the current head of trunk is just fine as well...
--- The fact that there's a Highway to Hell but only a Stairway to Heaven says a lot about anticipated traffic volume. >-----Original Message----- >From: sqlite-users [mailto:sqlite-users- >boun...@mailinglists.sqlite.org] On Behalf Of Dan Kennedy >Sent: Friday, 4 August, 2017 02:26 >To: sqlite-users@mailinglists.sqlite.org >Subject: Re: [sqlite] Checkin d8637bad produces bad amalgamation > >On 08/04/2017 03:50 AM, Keith Medcalf wrote: >> Check-in d8637bad produces a bad amalgamation output. > >Thanks for reporting this. Should be fixed now. > >Dan. > > > >> >> Index: tool/mksqlite3c-noext.tcl >> ================================================================== >> --- tool/mksqlite3c-noext.tcl >> +++ tool/mksqlite3c-noext.tcl >> @@ -26,11 +26,11 @@ >> # from in this file. The version number is needed to generate >the header >> # comment of the amalgamation. >> # >> set addstatic 1 >> set linemacros 0 >> -set useapicall 0 >> +set useapicall 1 >> for {set i 0} {$i<[llength $argv]} {incr i} { >> set x [lindex $argv $i] >> if {[regexp {^-+nostatic$} $x]} { >> set addstatic 0 >> } elseif {[regexp {^-+linemacros} $x]} { >> >> Index: tool/mksqlite3c.tcl >> ================================================================== >> --- tool/mksqlite3c.tcl >> +++ tool/mksqlite3c.tcl >> @@ -26,11 +26,11 @@ >> # from in this file. The version number is needed to generate >the header >> # comment of the amalgamation. >> # >> set addstatic 1 >> set linemacros 0 >> -set useapicall 0 >> +set useapicall 1 >> for {set i 0} {$i<[llength $argv]} {incr i} { >> set x [lindex $argv $i] >> if {[regexp {^-+nostatic$} $x]} { >> set addstatic 0 >> } elseif {[regexp {^-+linemacros} $x]} { >> >> Index: tool/mksqlite3h.tcl >> ================================================================== >> --- tool/mksqlite3h.tcl >> +++ tool/mksqlite3h.tcl >> @@ -36,11 +36,11 @@ >> # >> set TOP [lindex $argv 0] >> >> # Enable use of SQLITE_APICALL macros at the right points? >> # >> -set useapicall 0 >> +set useapicall 1 >> >> if {[lsearch -regexp [lrange $argv 1 end] {^-+useapicall}] != -1} >{ >> set useapicall 1 >> } >> >> >> Is applied so that the SQLITE_APICALL defines are added to the >amalgamation >> and RBU is included in the amalgamation >> >> then the output sqlite3.c file contains entries such as (from >_SQLITE3RBU_H_): >> >> SQLITE_API SQLITE_API sqlite3rbu *SQLITE_APICALL sqlite3rbu_open( >> const char *zTarget, >> const char *zRbu, >> const char *zState >> ); >> >> for all the function definitions. >> >> The actual definition of the function is fine however. >> >> ISSUE: >> >> If SQLITE_API is defined as "_declspec(export)" this does not >create a problem since the multiple declarations of the same >attribute are not syntax violations, >> however >> If SQLITE_API is defined as "static" this causes the compiler to >vomit because "static static void* function(...bunchOfArgs)" is >invalid syntax. >> >> --- >> The fact that there's a Highway to Hell but only a Stairway to >Heaven says a lot about anticipated traffic volume. >> >> >> >> >> _______________________________________________ >> sqlite-users mailing list >> sqlite-users@mailinglists.sqlite.org >> http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/sqlite- >users > > >_______________________________________________ >sqlite-users mailing list >sqlite-users@mailinglists.sqlite.org >http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/sqlite-users _______________________________________________ sqlite-users mailing list sqlite-users@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/sqlite-users
