From: mistachkin <mistachkin@noemail.net>
Date: Thu, 21 Jun 2012 14:05:15 +0000 (+0000)
Subject: Merge several compiler compatibility fixes to trunk.
X-Git-Tag: version-3.7.14~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe7b2bc9ffb0e8e5751222579739f3bfec23923a;p=thirdparty%2Fsqlite.git

Merge several compiler compatibility fixes to trunk.

FossilOrigin-Name: d3d491a5461e21d84c6425977b80deedc7fa8a3a
---

fe7b2bc9ffb0e8e5751222579739f3bfec23923a
diff --cc manifest
index b28db56120,5f05b6d64e..487849dd65
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Remove\ssupport\sfor\sOS/2\sfrom\sthe\ssource\stree.
- D 2012-06-21T13:00:37.211
 -C Allow\sthe\sSQLITE_API\smacro\sto\sapply\sto\sthe\ssqlite3_win32_sleep\sfunction.
 -D 2012-06-18T17:15:29.347
++C Merge\sseveral\scompiler\scompatibility\sfixes\sto\strunk.
++D 2012-06-21T14:05:15.442
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4
 +F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
 +F Makefile.msc e893726c32ff402760eea125c7baaf928ed24257
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
@@@ -154,14 -154,16 +154,14 @@@ F src/mem3.c 61c9d47b792908c532ca3a62b9
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
  F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
  F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
 -F src/mutex.h 2a79e0c10c26412546b501ee0f3d92b42decf63e
 +F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
 -F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c db8970270841e2385a43602477e84c4b19aff1db
+ F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 -F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca
 +F src/os.h c2ebd26a68a4223fe170b003852b97d9e7211498
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 -F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
  F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b
  F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
@@@ -177,7 -179,7 +177,7 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
- F src/shell.c d332251457860fa2fe365a4ac623266d2b262319
 -F src/shell.c 79cbf565f50c7b9ab0a622e0a7d612ad3b97a685
++F src/shell.c 74e47ddb99bf7997985dc89bbdd5875637501ad1
  F src/sqlite.h.in 39f041ce71a0d994e2487014fc9e8721595f5bc0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
  F src/sqliteInt.h 29b5348f0056d9b46d0bb94d4853db21568afde9
@@@ -1004,7 -1005,7 +1004,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P f6be345ad5ff739bd64114489930bab970e7972e
- R 492386d04a647f2a6a5176511e3c5436
- U drh
- Z a98b35ee88892c9758a44c5d42a86c30
 -P f970a3de61fe2ebaf1778c4a3383cfdc52299162
 -R f7c2f2158f3710573c689aa0bb5b67ff
++P ff828c67e5d3c1afa5bc3a304b9c6fcc7b3ea5fa 21266c68afb067ff40062df1e8b383dfd247c17b
++R 2cae3db7f4ceb9e36c95e758c69ad1d1
+ U mistachkin
 -Z 6375ed0474e573645b8013045823eb03
++Z 41747913182fa12ccba50300e60c3ef8
diff --cc manifest.uuid
index bdacec9c75,94bee6bf1f..5b4cc84b00
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ff828c67e5d3c1afa5bc3a304b9c6fcc7b3ea5fa
 -21266c68afb067ff40062df1e8b383dfd247c17b
++d3d491a5461e21d84c6425977b80deedc7fa8a3a
diff --cc src/shell.c
index d2cefbd452,3f28680235..ad919709a0
--- a/src/shell.c
+++ b/src/shell.c
@@@ -2692,11 -2696,13 +2692,13 @@@ static char *find_home_dir(void)
    static char *home_dir = NULL;
    if( home_dir ) return home_dir;
  
 -#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL)
 +#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL)
-   struct passwd *pwent;
-   uid_t uid = getuid();
-   if( (pwent=getpwuid(uid)) != NULL) {
-     home_dir = pwent->pw_dir;
+   {
+     struct passwd *pwent;
+     uid_t uid = getuid();
+     if( (pwent=getpwuid(uid)) != NULL) {
+       home_dir = pwent->pw_dir;
+     }
    }
  #endif