Also adjust the order of files in the amalgamation to ensure that

_FILE_OFFSET_BITS is defined before any #include, for QNX.

FossilOrigin-Name: 23001a85cd334090cf6c70d4d7e722a01f4f6899

diff --git a/manifest b/manifest
index c264178bb7c209be56bcd7f198111668f1e2c569..f25d3185ffd07bf8d3c49512f7e361b36718a94b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C QNX\srequires\sthat\s_FILE_OFFSET_BITS\sbe\sset\sprior\sto\sany\ssystem\s#include.
-D 2014-02-25T14:52:01.414
+C Also\sadjust\sthe\sorder\sof\sfiles\sin\sthe\samalgamation\sto\sensure\sthat\n_FILE_OFFSET_BITS\sis\sdefined\sbefore\sany\s#include,\sfor\sQNX.
+D 2014-02-25T18:12:58.878
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1120,7 +1120,7 @@ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
-F tool/mksqlite3c.tcl e2ba20d3f690990079d17f3e5a7417dfb7ada543
+F tool/mksqlite3c.tcl ed5b4e9ca8bf209ff401059a16362f37710fd8b8
 F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
@@ -1151,7 +1151,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 2477b3a294beb35f806a38f3ebc008942ba01617
-R 2f8f4da586e3827cd7880a024d14180d
+P 953cdd6adadfd46b51ad61d7939cecca154a02cb
+R d169e5164f16cb0355a3972eba04326c
 U drh
-Z d8c76b3503c5028bde8839a0e5ab0156
+Z 6c6f89e1dd41d2a146386cfa06ae53d9

diff --git a/manifest.uuid b/manifest.uuid
index bb142df59c2b789d7d0927f3949e87eb43100846..a069c374c5d8a5a57da236dcf069eea2831d3752 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-953cdd6adadfd46b51ad61d7939cecca154a02cb
\ No newline at end of file
+23001a85cd334090cf6c70d4d7e722a01f4f6899
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index de9b48b97b697330dff1daa3b1730d0144f9acc9..7a4fe1b389f5d529ac25d18277f8d194eca99f2c 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -121,7 +121,6 @@ foreach hdr {
   set available_hdr($hdr) 1
 }
 set available_hdr(sqliteInt.h) 0
-set available_hdr(sqlite3.h) 0
 
 # 78 stars used for comment formatting.
 set s78 \
@@ -229,7 +228,6 @@ proc copy_file {filename} {
 # inlining opportunities.
 #
 foreach file {
-   sqlite3.h
    sqliteInt.h
 
    global.c