Disable the pagerAcquireMapPage() routine if memory-mapped I/O is disabled.

This fixes a harmless compiler warning on OpenBSD.

FossilOrigin-Name: 3e25ba6e42fba239795a465b8510386a361ee5be
This commit is contained in:
drh 2016-12-30 12:06:22 +00:00
parent fb4e3a3bbb
commit 9c4dc22926
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C Encode\sa\s64-bit\sinteger\sliteral\sin\sdate.c\sas\sa\sconstant\sexpression\sso\sthat\nit\sworks\son\solder\scompilers.\s\sAlso\sfix\sa\sharmless\scompiler\swarning\sin\svdbe.c.
D 2016-12-30T00:09:14.046
C Disable\sthe\spagerAcquireMapPage()\sroutine\sif\smemory-mapped\sI/O\sis\sdisabled.\nThis\sfixes\sa\sharmless\scompiler\swarning\son\sOpenBSD.
D 2016-12-30T12:06:22.488
F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@ -375,7 +375,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
F src/pager.c 81fe2bb847df537694ec39e28e8b3dc221c64a7d
F src/pager.c 1c7a2b82b290b85b90f9275ae003f688935f70f9
F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
@ -1540,7 +1540,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P afcdc4a60e357d171156e0de705bf7ad1b37daab
R 813e73c67c9aeca5cd69ce74ed137efb
P f57952bac652901e1bd48b68301941efbcf29dc4
R 84982edb372ca58cbe65b01953728d25
U drh
Z 3112948a79a12b2a077d364cd13de4f8
Z cbb966aa1c32407e62c70cc77619dbe0

View File

@ -1 +1 @@
f57952bac652901e1bd48b68301941efbcf29dc4
3e25ba6e42fba239795a465b8510386a361ee5be

View File

@ -3964,6 +3964,7 @@ static int pagerSyncHotJournal(Pager *pPager){
return rc;
}
#if SQLITE_MAX_MMAP_SIZE>0
/*
** Obtain a reference to a memory mapped page object for page number pgno.
** The new object will use the pointer pData, obtained from xFetch().
@ -4012,6 +4013,7 @@ static int pagerAcquireMapPage(
return SQLITE_OK;
}
#endif
/*
** Release a reference to page pPg. pPg must have been returned by an