/ Check-in [1dada515]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update compiler error message regarding the choice of memory allocator defines.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1dada5158215d1816edb69ff2610f9d2259ce19d
User & Date: mistachkin 2011-08-26 11:25:02
Context
2011-08-26
20:55
Fix several harmless compiler warnings and a documentation bug. check-in: 5454d0fe user: drh tags: trunk
19:20
Merge the latest trunk changes into the sessions branch. check-in: eb036d6f user: drh tags: sessions
19:18
Merge the latest trunk changes into the apple-osx branch. check-in: 55af8003 user: drh tags: apple-osx
13:16
Merge the stat3-enhancement branch with trunk, but keep the resulting merge in a separate branch for now. check-in: 63f2c785 user: drh tags: stat3-trunk
11:25
Update compiler error message regarding the choice of memory allocator defines. check-in: 1dada515 user: mistachkin tags: trunk
11:18
Merge Win32 native heap support into trunk. check-in: 5238a749 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Changes to src/sqliteInt.h.

159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
** pared it down to just these two.)
**
** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
** the default.
*/
#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)>1
# error "At most one of the following compile-time configuration options\
 is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG"
#endif
#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)==0
# define SQLITE_SYSTEM_MALLOC 1
#endif

/*
** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the







|







159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
** pared it down to just these two.)
**
** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
** the default.
*/
#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)>1
# error "At most one of the following compile-time configuration options\
 is allows: SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG"
#endif
#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_WIN32_MALLOC)+defined(SQLITE_MEMDEBUG)==0
# define SQLITE_SYSTEM_MALLOC 1
#endif

/*
** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the