From: mistachkin <mistachkin@noemail.net>
Date: Fri, 26 Aug 2011 11:18:44 +0000 (+0000)
Subject: Merge Win32 native heap support into trunk.
X-Git-Tag: version-3.7.8~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2f496aab50ecded7178a603a6b4ce6d02576aec;p=thirdparty%2Fsqlite.git

Merge Win32 native heap support into trunk.

FossilOrigin-Name: 5238a74987507f27af4080e2842f53e049b5b111
---

d2f496aab50ecded7178a603a6b4ce6d02576aec
diff --cc Makefile.msc
index 60fe09dcd1,7630635847..022939f2fa
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -48,6 -79,18 +79,18 @@@ TCC = $(TCC) -DSQLITE_ENABLE_IOTRAC
  #
  TCC = $(TCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS
  
+ #
+ # Use native Win32 heap instead of malloc/free?
+ #
 -TCC = $(TCC) -DSQLITE_WIN32_MALLOC=1
++# TCC = $(TCC) -DSQLITE_WIN32_MALLOC=1
+ 
+ #
+ # Validate the heap on every call into the native Win32 heap subsystem?
+ #
+ !IF $(DEBUG)>2
+ TCC = $(TCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1
+ !ENDIF
+ 
  # The locations of the Tcl header and library files.  Also, the library that
  # non-stubs enabled programs using Tcl must link against.  These variables
  # (TCLINCDIR, TCLLIBDIR, and LIBTCL) may be overridden via the environment
diff --cc manifest
index 592d23a24a,021bd20ee7..d9d94740e2
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Create\sa\snew\spager\stype,\sPAGER_SORTER,\sfor\suse\sin\sthe\sexternal\smerge\ssort.\nSuch\spagers\sare\salways\sheld\sin\smemory\sbut\sdo\sreport\swhen\sthey\sare\sunder\nmemory\spressure\sby\scalling\spagerStress.
- D 2011-08-26T00:34:45.360
 -C In\sthe\sMSVC\smakefile,\sallow\ssymbols\sto\sbe\senabled\swithout\sNDEBUG\sdefined.\s\sAlso,\sfor\sthe\swin32lock\stest,\smake\ssure\sthe\sdatabase\sis\sclosed\sprior\sto\sshutdown.
 -D 2011-08-26T05:40:31.767
++C Merge\sWin32\snative\sheap\ssupport\sinto\strunk.
++D 2011-08-26T11:18:44.284
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 386444f1e1a1536d19a426030d93fd6e03b7d3b5
 -F Makefile.msc bef57955ca8a1e174cabcba1aab3eae71a0440b6
++F Makefile.msc 55fe94bf23b4c1ff035f19b0ae2ea486350f8d01
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@@ -165,10 -165,10 +165,10 @@@ F src/os.c fcc717427a80b2ed225373f07b64
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 81341980c52a44106b10c1e28a0d5c5247476452
 +F src/os_unix.c 1a34ca3794ced80e4a4ebcc3ba1f4c516762e534
- F src/os_win.c 19fa09046f1f86590a188abdcf5630b8fe8279cf
+ F src/os_win.c 86bcb5bd0386c761c764c3383879469346da3a14
 -F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 -F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 +F src/pager.c 817f7f7140c9fa2641f28e6330e924708ddd870d
 +F src/pager.h 2bab1b2ea4eac58663b5833e3522e36b5ff63447
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@@ -183,7 -183,7 +183,7 @@@ F src/select.c d219c4b68d603cc734b6f9b1
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
  F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 18876859c6a60fd42b4e3772229387390702f096
 -F src/sqliteInt.h 5004ed078f0a4fd9a725b2eb75d7cf758cf86e91
++F src/sqliteInt.h 42e60144648d32e5a6c9994b2baa58b9cf8db69b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -961,7 -961,7 +961,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P 2c443d47ecee7b43a89f0a4bf299c46c66e3f80d
- R 5271767b893f002dc634ff718e14ca01
- U drh
- Z 986c77c3e73f3db4a3199ce94583c644
 -P 50edc2f9141bd13277119afd129387029ebe5c01
 -R 002b2d3196bf95293f3cedb09dc37ba9
++P c71d73201d950355862dd8d5de142c9673888755 5ed7633d41b99929309a7e13d37375a4fdae43b3
++R 6db87d8333d6edb6b791bc23dadc42e1
+ U mistachkin
 -Z ce7b6301abcea19c7a2844759d8d5a41
++Z 81e8aedab83fc3e19b6d4ef38c1919d2
diff --cc manifest.uuid
index d151ff9b84,f1af0da178..a5277be89e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c71d73201d950355862dd8d5de142c9673888755
 -5ed7633d41b99929309a7e13d37375a4fdae43b3
++5238a74987507f27af4080e2842f53e049b5b111