database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix macro issues for osGetProcessHeap and sqlite3_win32_write_debug.

Browse Source 
FossilOrigin-Name: d3d071598aba367e3d73001ab38d7a78306875ea
This commit is contained in:
mistachkin
2012-03-14 23:08:59 +00:00
parent e8c9a184be
commit 16afb9ee96
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\stypos,\suse\s#if\sinstead\sof\s#ifdef\swhen\schecking\sfor\sthe\sWin32\snative\sheap\svalidation\sdefine.
D 2012-03-14T20:20:37.765
C Fix\smacro\sissues\sfor\sosGetProcessHeap\sand\ssqlite3_win32_write_debug.
D 2012-03-14T23:08:59.126
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,7 +167,7 @@ F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
F src/os_win.c 817bce5df90080879263f0a7b0d6be194f5a152e
F src/os_win.c a2e9d48184b8b29075d7be2b5e990c4af48cf05a
F src/pager.c 3955b62cdb5bb64559607cb474dd12a6c8e1d4a5
F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
@@ -992,7 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 46c412a8f6470c9e8c4bdeafaf4db435fbb694ab
R 39e5d64245595f7182fd72bc71b1f514
P 845aa46f69784420ada4116078f8dc0a68cf3707
R 19913ba6cd236428e778abd041ed11a4
U mistachkin
Z f46c995916aec3a9f0322bdbc2b14015
Z 1c2030e83f925395c20a7055c12f2bff

2
manifest.uuid
View File

@@ -1 +1 @@
845aa46f69784420ada4116078f8dc0a68cf3707
d3d071598aba367e3d73001ab38d7a78306875ea

6
src/os_win.c
View File

@@ -98,7 +98,7 @@ struct winFile {
* The size of the buffer used by sqlite3_win32_write_debug().
*/
#ifndef SQLITE_WIN32_DBG_BUF_SIZE
# define SQLITE_WIN32_DBG_BUF_SIZE (4096-sizeof(DWORD))
# define SQLITE_WIN32_DBG_BUF_SIZE ((int)(4096-sizeof(DWORD)))
#endif
/*
@@ -788,7 +788,7 @@ static struct win_syscall {
{ "GetProcessHeap", (SYSCALL)GetProcessHeap, 0 },
#define osGetProcessHeap() ((HANDLE(WINAPI*)(VOID))aSyscall[71].pCurrent)
#define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[71].pCurrent)
}; /* End of the overrideable system calls */
@@ -882,7 +882,7 @@ static const char *winNextSystemCall(sqlite3_vfs *p, const char *zName){
void sqlite3_win32_write_debug(char *zBuf, int nBuf){
char zDbgBuf[SQLITE_WIN32_DBG_BUF_SIZE];
int nMin = MIN(nBuf,SQLITE_WIN32_DBG_BUF_SIZE-1); /* may be negative. */
int nMin = MIN(nBuf, (SQLITE_WIN32_DBG_BUF_SIZE - 1)); /* may be negative. */
if( nMin<-1 ) nMin = -1; /* all negative values become -1. */
assert( nMin==-1 || nMin==0 || nMin<SQLITE_WIN32_DBG_BUF_SIZE );
#if defined(SQLITE_WIN32_HAS_ANSI)