From: drh <drh@noemail.net>
Date: Wed, 20 Jan 2010 13:20:22 +0000 (+0000)
Subject: Align the os_unix.c source file with the version found on trunk.
X-Git-Tag: mountain-lion~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b90b2209f8bf2cbba786bd4842cda0c05daeaa9;p=thirdparty%2Fsqlite.git

Align the os_unix.c source file with the version found on trunk.

FossilOrigin-Name: fa0f6c140e8ff9a5eed1d8a339fb6d55ecdca688
---

0b90b2209f8bf2cbba786bd4842cda0c05daeaa9
diff --cc manifest
index 1c2962dc55,4dc116a4d3..f8e52c8bfb
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Update\sthe\sApple\sOS-X\sbranch\sto\sinclude\sall\sof\sthe\slatest\schanges\sin\strunk.
- D 2010-01-20T01:26:07
 -C Move\sthe\sApple\sOS-X\sVFS\schanges\sinto\sthe\strunk.
 -D 2010-01-20T13:07:21
++C Align\sthe\sos_unix.c\ssource\sfile\swith\sthe\sversion\sfound\son\strunk.
++D 2010-01-20T13:20:23
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 +F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -792,14 -788,14 +792,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a7a0c8d644873764cb799f9d6aacede4a4fb531f 095c74ea6260096f6a600fdc0edccf7ea24aace4
- R 9efc2ddca9523f1d13408e0a94e5c09d
 -P 095c74ea6260096f6a600fdc0edccf7ea24aace4
 -R e4abf14fe2df55de8faa5f5d45f42420
++P 96499b1dd69a0954e30e4b5b4f2272ab306afcdb 571594bfbe89d9949bdb8b07712e96d0a3467c6e
++R a941e3b4351f348c4273e4ffefa122f7
  U drh
- Z 171e5663e7167a7a582c0d48cd85564a
 -Z ec0cb069e0230592effd43c2896e2f61
++Z b7bdf37e77a6e7947e42f3f327673189
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFLVluyoxKgR168RlERAptFAJ0ezMHELePGnkaE3fPF5VuOdS+P+wCdFprX
- uvkr3u4H0si4VaJuh+e1VI0=
- =sYOn
 -iD8DBQFLVwANoxKgR168RlERAmzcAJ9oMlWU73oI5EEQ1akOqN4co4sD0QCeKjK8
 -uNDkKBTXCwwi5UODxueds0E=
 -=6M6W
++iD8DBQFLVwMaoxKgR168RlERAqE/AJ9fO7S6dcVrGQzP7yNPtPGJbQk/0wCcCvNu
++2NymGUEKKtQgKWSphPhh2gY=
++=cIK7
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 22721a2673,a66026252d..9a597c7fa4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 96499b1dd69a0954e30e4b5b4f2272ab306afcdb
 -571594bfbe89d9949bdb8b07712e96d0a3467c6e
++fa0f6c140e8ff9a5eed1d8a339fb6d55ecdca688