From: drh <drh@noemail.net>
Date: Wed, 18 Jan 2012 18:22:44 +0000 (+0000)
Subject: Avoid overriding the malloc_usable_size symbol using the C preprocessor as
X-Git-Tag: version-3.7.11~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0541b3d4278f9d835146b91352b79531ba32c6a3;p=thirdparty%2Fsqlite.git

Avoid overriding the malloc_usable_size symbol using the C preprocessor as
this might be confusing the build on some systems.

FossilOrigin-Name: bbaec351dd7784fd0af24b916110844176810f82
---

diff --git a/manifest b/manifest
index c6b2d7e549..b3a39eeed2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_WITHOUT_MSIZE\sand\sSQLITE_WITHOUT_ZONEMALLOC\smacros\sin\smem1.c\nto\sdisable\sthe\suse\sof\s_msize()\son\swindows\sand\sthe\szone\smemory\sallocator\non\sApple\sproducts,\srespectively.
-D 2012-01-18T12:46:47.040
+C Avoid\soverriding\sthe\smalloc_usable_size\ssymbol\susing\sthe\sC\spreprocessor\sas\nthis\smight\sbe\sconfusing\sthe\sbuild\son\ssome\ssystems.
+D 2012-01-18T18:22:44.221
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -150,7 +150,7 @@ F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 F src/main.c e60abee4a7ca3da31b67745ccf02b8d29f138614
 F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
-F src/mem1.c 3137fd0e24d55554028a0a07d01240dc506101ee
+F src/mem1.c 7e698fe3368c661e98a25dca9a20933bcb61e228
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
 F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@ -987,7 +987,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P d0dabe2f37b5fa7c2c6bb728b8591af00cdd835b
-R 0cad542fee6809889fa727063bfca9db
+P 238e35a4411a5b2231576254dba39b802947d4f3
+R 2f9a38f200fa803aebab14874180ccba
 U drh
-Z cc476ae956a6554c8c6b5581c191930f
+Z 16294f0096eebc0abb45ed8fd23fbf16
diff --git a/manifest.uuid b/manifest.uuid
index d65e632127..2ef62dbef7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-238e35a4411a5b2231576254dba39b802947d4f3
\ No newline at end of file
+bbaec351dd7784fd0af24b916110844176810f82
\ No newline at end of file
diff --git a/src/mem1.c b/src/mem1.c
index 48e1367695..c03122161f 100644
--- a/src/mem1.c
+++ b/src/mem1.c
@@ -62,7 +62,7 @@
 #if !defined(HAVE_MALLOC_USABLE_SIZE) && SQLITE_OS_WIN \
       && !defined(SQLITE_WITHOUT_MSIZE)
 # define HAVE_MALLOC_USABLE_SIZE 1
-# define malloc_usable_size _msize
+# define SQLITE_MALLOCSIZE _msize
 #endif
 
 #if defined(__APPLE__) && !defined(SQLITE_WITHOUT_ZONEMALLOC)
@@ -92,10 +92,12 @@ static malloc_zone_t* _sqliteZone_;
 #define SQLITE_REALLOC(x,y) realloc((x),(y))
 
 #ifdef HAVE_MALLOC_USABLE_SIZE
-#include <malloc.h>
-#define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
+# ifndef SQLITE_MALLOCSIZE
+#  include <malloc.h>
+#  define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
+# endif
 #else
-#undef SQLITE_MALLOCSIZE
+# undef SQLITE_MALLOCSIZE
 #endif
 
 #endif /* __APPLE__ or not __APPLE__ */