From: drh <drh@noemail.net>
Date: Thu, 22 Mar 2007 15:22:06 +0000 (+0000)
Subject: In os_unix.c, make a distinction between pread() and pread64().  Add a new
X-Git-Tag: version-3.6.10~2461
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8350a2187aa29a5df7c12ecc9cf8f43aa36129ce;p=thirdparty%2Fsqlite.git

In os_unix.c, make a distinction between pread() and pread64().  Add a new
compile-time macro USE_PREAD64 to select the latter. (CVS 3709)

FossilOrigin-Name: 177cd92910d01c97eb3133a59fad417edbb1aa92
---

diff --git a/manifest b/manifest
index a50f82bb0e..5d7d2b99e0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Call\ssqlite3_free()\sinstead\sof\sfree()\sto\srelease\sa\sbuffer\sallocated\sby\ssqlite3_vmprintf()\sin\stest_async.c\s(test\ssuite\sbug\sonly).\s(CVS\s3708)
-D 2007-03-22T15:20:00
+C In\sos_unix.c,\smake\sa\sdistinction\sbetween\spread()\sand\spread64().\s\sAdd\sa\snew\ncompile-time\smacro\sUSE_PREAD64\sto\sselect\sthe\slatter.\s(CVS\s3709)
+D 2007-03-22T15:22:06
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -82,7 +82,7 @@ F src/os_os2.c 175101ffc2142c3fc7962ed7a171806f28f95363
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 33ee7c1483fbd4d67cf5638c87622c277442b744
+F src/os_unix.c f6c261661a4b88da679dfb45069a46680d8f18d3
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c f3ca3e08167eb3382781b840e787809eccb626dc
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -437,7 +437,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P d04fa3a13a84f49074c673b8ee2fb6541da061b5
-R 5327334ba0c57477e0c9404d6f419f54
-U danielk1977
-Z 8aabe8cf7a145f47786e9385aa8a3f47
+P b078f09bffee5863d595d281f2ecd14e1c9ec727
+R 9457b72e4d50a7bf046bedc43327a3b4
+U drh
+Z 2f03d003f64477a1b374c8414bc90cbd
diff --git a/manifest.uuid b/manifest.uuid
index bc2eba9d21..56654afcff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b078f09bffee5863d595d281f2ecd14e1c9ec727
\ No newline at end of file
+177cd92910d01c97eb3133a59fad417edbb1aa92
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 42d988403e..dfbb9338cf 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1002,8 +1002,10 @@ static int seekAndRead(unixFile *id, void *pBuf, int cnt){
   int got;
   i64 newOffset;
   TIMER_START;
-#ifdef USE_PREAD
+#if defined(USE_PREAD)
   got = pread(id->h, pBuf, cnt, id->offset);
+#elif defined(USE_PREAD64)
+  got = pread64(id->h, pBuf, cnt, id->offset);
 #else
   newOffset = lseek(id->h, id->offset, SEEK_SET);
   if( newOffset!=id->offset ){
@@ -1047,8 +1049,10 @@ static int seekAndWrite(unixFile *id, const void *pBuf, int cnt){
   int got;
   i64 newOffset;
   TIMER_START;
-#ifdef USE_PREAD
+#if defined(USE_PREAD)
   got = pwrite(id->h, pBuf, cnt, id->offset);
+#elif defined(USE_PREAD64)
+  got = pwrite64(id->h, pBuf, cnt, id->offset);
 #else
   newOffset = lseek(id->h, id->offset, SEEK_SET);
   if( newOffset!=id->offset ){