From: drh Date: Tue, 25 Feb 2014 14:52:01 +0000 (+0000) Subject: QNX requires that _FILE_OFFSET_BITS be set prior to any system #include. X-Git-Tag: version-3.8.4~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e990bea516af17f76e29853f2eb65cdd7bafe46;p=thirdparty%2Fsqlite.git QNX requires that _FILE_OFFSET_BITS be set prior to any system #include. FossilOrigin-Name: 953cdd6adadfd46b51ad61d7939cecca154a02cb --- diff --git a/manifest b/manifest index ee235b0695..c264178bb7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sseveral\ssmall\sstyle/consistency\sissues\swith\sthe\sprevious\scheck-in. -D 2014-02-24T21:42:33.898 +C QNX\srequires\sthat\s_FILE_OFFSET_BITS\sbe\sset\sprior\sto\sany\ssystem\s#include. +D 2014-02-25T14:52:01.414 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -221,7 +221,7 @@ F src/shell.c 3dd86bf73ccd079f0e32ef5069600586085e8239 F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc -F src/sqliteInt.h 616f8a225bfd6cf09f7f5906c7b91b29a3591b34 +F src/sqliteInt.h 6725dc99b3985a97bad315910e59c3f7f5058916 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@ -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 53081e7202fb55f792a78e73627466eb0200f11c -R eaeb88d7c9d1a25aae3665432185c5f6 -U mistachkin -Z 8d06aaa0b8bcae8ffbf3fa0332e7604d +P 2477b3a294beb35f806a38f3ebc008942ba01617 +R 2f8f4da586e3827cd7880a024d14180d +U drh +Z d8c76b3503c5028bde8839a0e5ab0156 diff --git a/manifest.uuid b/manifest.uuid index 9798e1319d..bb142df59c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2477b3a294beb35f806a38f3ebc008942ba01617 \ No newline at end of file +953cdd6adadfd46b51ad61d7939cecca154a02cb \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index a6663ff679..72fe47be5a 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -12,7 +12,6 @@ ** Internal interface definitions for SQLite. ** */ -#include "sqlite3.h" #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -48,6 +47,11 @@ # define _LARGEFILE_SOURCE 1 #endif +/* The public SQLite interface. The _FILE_OFFSET_BITS macro must appear +** first in QNX. +*/ +#include "sqlite3.h" + /* ** Include the configuration header output by 'configure' if we're using the ** autoconf-based build