From 32121199be5e64c99d060476c6531fe43521e57a Mon Sep 17 00:00:00 2001 From: mistachkin Date: Wed, 9 Nov 2011 17:01:40 +0000 Subject: [PATCH] When compiling with MSVC, use the _msize function. FossilOrigin-Name: 797a147934743a565c6f1f9dd4d41574690b4c2b --- Makefile.msc | 3 +++ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.msc b/Makefile.msc index f40936d915..ea7efa7580 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -49,6 +49,9 @@ BCC = cl.exe # TCC = cl.exe -W3 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -fp:precise +# We always have the _msize function available when using MSVC. +TCC = $(TCC) -DHAVE_MALLOC_USABLE_SIZE -Dmalloc_usable_size=_msize + # The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in # any extension header files by default. For non-amalgamation # builds, we need to make sure the compiler can find these. diff --git a/manifest b/manifest index d2fca0f81f..e2b45c4c60 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Minor\schanges\sneeded\sto\srestore\sfull\sbranch\stest\scoverage. -D 2011-11-09T16:12:24.434 +C When\scompiling\swith\sMSVC,\suse\sthe\s_msize\sfunction. +D 2011-11-09T17:01:40.187 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d +F Makefile.msc 3bd3641a345d488a9601c0cc7f9d35aeede5d12b F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION bb37c274b503bbe73f00ea4f374eb817cba4b171 @@ -974,7 +974,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P b3faa680aedc94ed8aa2819228c0d304b181cc51 -R b23b4af5ccb8f4c997cdcda51776df0c -U drh -Z d923662f887715e80eb341a5d52f178f +P bc10a753579b65ba4604867204b7b3d8383f3ac7 +R b4ab2e16a52b2d4a4a1aafe11f524dda +U mistachkin +Z 36fa820f8cb337e79d0b9d411145a7d3 diff --git a/manifest.uuid b/manifest.uuid index 574c5c2aab..48433751d7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bc10a753579b65ba4604867204b7b3d8383f3ac7 \ No newline at end of file +797a147934743a565c6f1f9dd4d41574690b4c2b \ No newline at end of file -- 2.47.2