diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 16:07:45 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 16:07:45 +0000 |
| commit | 1e314cf0de24d58991e66f8d66e09e6cb1454770 (patch) | |
| tree | 21c49494eae8dbe838277a60192e6141d10f1444 /third_party/sqlite | |
| parent | 6b50fec83127803432211052f4127659c0f8408e (diff) | |
| download | chromium_src-1e314cf0de24d58991e66f8d66e09e6cb1454770.zip chromium_src-1e314cf0de24d58991e66f8d66e09e6cb1454770.tar.gz chromium_src-1e314cf0de24d58991e66f8d66e09e6cb1454770.tar.bz2 | |
Should check #if OS_WIN in the sqlite code, not #ifdef.
Review URL: http://codereview.chromium.org/8768
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite')
| -rw-r--r-- | third_party/sqlite/pager.c | 4 | ||||
| -rw-r--r-- | third_party/sqlite/preload-cache.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/sqlite/pager.c b/third_party/sqlite/pager.c index aac6d059..bd700c2 100644 --- a/third_party/sqlite/pager.c +++ b/third_party/sqlite/pager.c @@ -4456,7 +4456,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){ ** the allocation will be large, go directly to the OS instead of the heap. **/ static void* allocLarge(size_t size) { -#ifdef OS_WIN +#if OS_WIN return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); #else return sqliteMallocRaw(size); @@ -4464,7 +4464,7 @@ static void* allocLarge(size_t size) { } static void freeLarge(void* ptr) { -#ifdef OS_WIN +#if OS_WIN VirtualFree(ptr, 0, MEM_RELEASE); #else sqliteFree(ptr); diff --git a/third_party/sqlite/preload-cache.patch b/third_party/sqlite/preload-cache.patch index d11e763..0aafb92 100644 --- a/third_party/sqlite/preload-cache.patch +++ b/third_party/sqlite/preload-cache.patch @@ -161,7 +161,7 @@ Index: pager.c +** the allocation will be large, go directly to the OS instead of the heap. +**/ +static void* allocLarge(size_t size) { -+#ifdef OS_WIN ++#if OS_WIN + return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); +#else + return sqliteMallocRaw(size); @@ -169,7 +169,7 @@ Index: pager.c +} + +static void freeLarge(void* ptr) { -+#ifdef OS_WIN ++#if OS_WIN + VirtualFree(ptr, 0, MEM_RELEASE); +#else + sqliteFree(ptr); |