]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Makefile changes to support building winsqlite3.dll using STDCALL rather
authordrh <drh@noemail.net>
Wed, 7 Sep 2016 12:41:06 +0000 (12:41 +0000)
committerdrh <drh@noemail.net>
Wed, 7 Sep 2016 12:41:06 +0000 (12:41 +0000)
than CDECL.

FossilOrigin-Name: af951e036ec7480d04656364fef1c6e24a24b1b2

1  2 
Makefile.msc
manifest
manifest.uuid

diff --cc Makefile.msc
Simple merge
diff --cc manifest
index 7e624b61cb058b44080765e867ff2d3c30056b0d,c87e7a94c8d712eb98496aad49e57985c62bb403..50d2d4756c092fddc1369f7e41d99509ba978b48
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Correct\saffinity\scomputations\sfor\sa\sSELECT\son\sthe\sRHS\sof\san\sIN\soperator.\nFix\sfor\sticket\s[199df4168c].
- D 2016-09-07T12:20:45.996
 -C Sync\sup\sthe\sMSVC\smakefiles.
 -D 2016-09-05T20:46:02.202
++C Makefile\schanges\sto\ssupport\sbuilding\swinsqlite3.dll\susing\sSTDCALL\srather\nthan\sCDECL.
++D 2016-09-07T12:41:06.204
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
 -F Makefile.msc 6fef1e10792656c94fe1393092de6c8ba6ea1c88
++F Makefile.msc 50e36f9aa2c4f8e0a02ba1984d7e81001827d97d
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 -F VERSION 25e2e333adeff5965520bc8db999c658898c972d
 +F VERSION b62230b0787a5adabb64c590cd8c0443271c1c70
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -1509,7 -1511,7 +1509,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P b4f8be1f3258823b3a8f316c92f9019f71ef86a0
- R 742bc7defda07dd553a21f17dc41fbef
 -P ea635bf97edb35b95b34adcb63f726f3573b1c4d
 -R d8ebd39537a766e051577a29d6825c19
 -U mistachkin
 -Z 1961d7bb5f7d90748e74759804c9ac8c
++P 2d1983ff9f786ead159a900b8c023ab5507ce26b f66d0d8cf6976c62f7bc0e9390b09fb9976178c1
++R 33fc5d91b463202d75ba27a8723a9a5e
 +U drh
- Z 287fe50a673ea0ec508c0e86ae809b4b
++Z 5e375284fce0411bc4a20adee34c3b9c
diff --cc manifest.uuid
index f4461cd8de936d61afa74c054d6fe9339d2e82c2,a4d0903718b28f3801a08eea6d005efb8d96c24d..158127a2b002f85ff5996a766316614bed7d594d
@@@ -1,1 -1,1 +1,1 @@@
- 2d1983ff9f786ead159a900b8c023ab5507ce26b
 -f66d0d8cf6976c62f7bc0e9390b09fb9976178c1
++af951e036ec7480d04656364fef1c6e24a24b1b2