Further fixes to the pread()/pwrite() enabling logic.

FossilOrigin-Name: 38fb54e7854ac0500a88585ff9dd7487b4b2e586

diff --git a/manifest b/manifest
index 1d5201bf29c26b6bdd3b52263e4169d5ee4a684a..be929a8bc70d0f89cfa9bae441d50dfb62194a1f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sfor\scases\swhen\spread()/pwrite()\sare\snot\savailable.
-D 2016-03-04T03:02:06.930
+C Further\sfixes\sto\sthe\spread()/pwrite()\senabling\slogic.
+D 2016-03-04T03:14:39.390
 F Makefile.in e335453db0b16da00c884ad51bb56d1c091a74de
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc dbd4621ecc585c2ef0c2aa0874698c54675754f1
@@ -333,7 +333,7 @@ F src/os.c ca9a104b677328ee037cfdf1a54a16fd1805e8c9
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 14a28aeb3b77102a90ed645534a8d319b8ac6082
+F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
 F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c d034c69b958c01289eb8070cbf902e1a68cd7e0b
@@ -1453,7 +1453,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 2cffb9e50bed77d1079603f5b4a71b7559de7294
-R 340d2ced6d6364f0299bbd36b34b2f41
+P 7d67d876b70c7a4199697c5b112d809c600e140e
+R ce4934ea34542df91b05d44a6acdf078
 U drh
-Z a704f390d3e95dbf657db754d417ef5a
+Z 4e6c0c7126b5fe5706a071d24d8aba5f

diff --git a/manifest.uuid b/manifest.uuid
index 6b0c506b3db3fa8e06ff84c4d27957f2718ba7c3..0966145f3c7d25ad8bc9450fbf3b61e9c3af372c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d67d876b70c7a4199697c5b112d809c600e140e
\ No newline at end of file
+38fb54e7854ac0500a88585ff9dd7487b4b2e586
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 844a1c46e179a747c0578f68286275a7d4d36109..d6fbd8058819b068a157f81813ea89830a551dfa 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -72,16 +72,16 @@
 #endif
 
 /* Use pread() and pwrite() if they are available */
+#if defined(__APPLE__)
+# define HAVE_PREAD 1
+# define HAVE_PWRITE 1
+#endif
 #if defined(HAVE_PREAD64) && defined(HAVE_PWRITE64)
 # undef USE_PREAD
-# undef USE_PWRITE
 # define USE_PREAD64 1
-# define USE_PWRITE64 1
 #elif defined(HAVE_PREAD) && defined(HAVE_PWRITE)
-# undef USE_PREAD
-# undef USE_PWRITE
-# define USE_PREAD64 1
-# define USE_PWRITE64 1
+# undef USE_PREAD64
+# define USE_PREAD 1
 #endif
 
 /*