]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Create new header file "os_setup.h" used to detect the operating system
authordrh <drh@noemail.net>
Mon, 5 May 2014 20:32:15 +0000 (20:32 +0000)
committerdrh <drh@noemail.net>
Mon, 5 May 2014 20:32:15 +0000 (20:32 +0000)
at compile-time, and "os_win.h" that contains windows-specific header in
formation.

FossilOrigin-Name: bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c

1  2 
Makefile.msc
manifest
manifest.uuid

diff --cc Makefile.msc
Simple merge
diff --cc manifest
index 0392d96bc738eca2e4023ff6020efd826fdd5dfb,a49aee7bc90a1e15abd4ab7d34c7b330c042e66f..f693fb7396ac72892f908240c9dba4b83dc4dc2e
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Work\son\scleaning\sup\sthe\sMSVC\sbatch\sbuild\stool\sintegration\swith\sVisual\sStudio\s2013.
- D 2014-05-05T20:24:34.916
 -C Attempt\sto\sfix\sthe\sbuild\son\sbeagleboard.
 -D 2014-05-05T20:21:52.937
++C Create\snew\sheader\sfile\s"os_setup.h"\sused\sto\sdetect\sthe\soperating\ssystem\nat\scompile-time,\sand\s"os_win.h"\sthat\scontains\swindows-specific\sheader\sin\nformation.
++D 2014-05-05T20:32:15.817
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
+ F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1e8c0f7e80f73b36d04520844e1e6c335cfe2000
- F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 -F Makefile.msc d1d9474b660e87a0134acd33693281883cb328b1
++F Makefile.msc cf9737350840c56f1e46204aa310227b8183c221
+ F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1166,7 -1168,7 +1168,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 4760504396bcf44528eb8de9ed7aa5d9659c54b6
- R 430719bf3d22eab8999716ab9edcc7d3
- U mistachkin
- Z 9015c1d19aac4c8ce51a7c46f2b60a96
 -P 857f2baf9b722e4eb1ac0d50fe03e32d5176185b
 -R 13f47e22fa817432bd25922bb1ff1b2f
++P b5a72dfd59fba6a9938ac1afdec06a2e6809fd2d 3ac75725a66730566105ad184a988a8f80f51055
++R 8d3da72aab741dd9279195207e6c8bd7
+ U drh
 -Z 55108ca91e730f32aa309dbf16d83499
++Z 892b3ce35265d0d6387ad7a7c3c1d88b
diff --cc manifest.uuid
index 22c786fba416311222e1e4081e2db7cd5b6ee762,f90aaab9440bd0e4508ac0235f85cbefc002a294..feb33def0671b37ce9a210388eddd8d2a995eb26
@@@ -1,1 -1,1 +1,1 @@@
- b5a72dfd59fba6a9938ac1afdec06a2e6809fd2d
 -3ac75725a66730566105ad184a988a8f80f51055
++bd92e0f80c1158d810b0d47e38f2fe06ff24bb8c