Index: src/os_unix.c
==================================================================
--- src/os_unix.c
+++ src/os_unix.c
@@ -3393,17 +3393,23 @@
 ** If the user has configured a chunk-size for this file, it could be
 ** that the file needs to be extended at this point. Otherwise, the
 ** SQLITE_FCNTL_SIZE_HINT operation is a no-op for Unix.
 */
 static int fcntlSizeHint(unixFile *pFile, i64 nByte){
-  if( pFile->szChunk ){
+  { /* preserve indentation of removed "if" */
     i64 nSize;                    /* Required file size */
+    i64 szChunk;                  /* Chunk size */
     struct stat buf;              /* Used to hold return values of fstat() */
    
     if( osFstat(pFile->h, &buf) ) return SQLITE_IOERR_FSTAT;
 
-    nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
+    szChunk = pFile->szChunk;
+    if( szChunk==0 ){
+      nSize = nByte;
+    }else{
+      nSize = ((nByte+szChunk-1) / szChunk) * szChunk;
+    }
     if( nSize>(i64)buf.st_size ){
 
 #if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
       /* The code below is handling the return value of osFallocate() 
       ** correctly. posix_fallocate() is defined to "returns zero on success, 

Index: test/wal5.test
==================================================================
--- test/wal5.test
+++ test/wal5.test
@@ -233,18 +233,11 @@
     do_test 2.3.$tn.3 { sql2 { BEGIN; SELECT * FROM t1 } } {1 2}
     do_test 2.3.$tn.4 { sql1 { INSERT INTO t1 VALUES(3, 4) } } {}
     do_test 2.3.$tn.5 { sql1 { INSERT INTO t2 VALUES(3, 4) } } {}
     do_test 2.3.$tn.6 { file_page_counts } {1 7 1 7}
     do_test 2.3.$tn.7 { code1 { do_wal_checkpoint db -mode full } } {1 7 5}
-    if {$tcl_platform(platform) == "windows"} {
-        # on unix, the size_hint is a no-op if no chunk size is set.
-        # the windows implementation does not have a similar check,
-        # and because of this, the db file size has an extra page.
-        do_test 2.3.$tn.8 { file_page_counts } {2 7 2 7}
-    } {
-        do_test 2.3.$tn.8 { file_page_counts } {1 7 2 7}
-    }
+    do_test 2.3.$tn.8 { file_page_counts } {2 7 2 7}
   }
 
   # Check that checkpoints block on the correct locks. And respond correctly
   # if they cannot obtain those locks. There are three locks that a checkpoint
   # may block on (in the following order):
@@ -348,6 +341,5 @@
   }
 }
 
 
 finish_test
-