Adjustments to #ifdefs so that the #include of <sys/mount.h> is not included

twice, because that confuses the amalgamation builder.

FossilOrigin-Name: 27413fc8dd52b754b4be9344a66bb9e0d752d48e

diff --git a/manifest b/manifest
index e60d7444ffac1866192e08e7b0e2f69180494d3d..9c14d92483648c9241a8915d36f2ddbdf0d46daf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\ssome\s#ifdefs\sso\sthat\sthe\sbuild\sworks\son\sMac\sboth\swith\sand\swithout\nSQLITE_ENABLE_LOCKING_STYLE.
-D 2010-03-05T13:41:06
+C Adjustments\sto\s#ifdefs\sso\sthat\sthe\s#include\sof\s<sys/mount.h>\sis\snot\sincluded\ntwice,\sbecause\sthat\sconfuses\sthe\samalgamation\sbuilder.
+D 2010-03-05T13:53:23
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +150,7 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
-F src/os_unix.c d4832e89360c7d1b980800437368cbf3b3297723
+F src/os_unix.c 148d2f625db3727250c0b880481ae7630b6d0eb0
 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053
 F src/pager.c ace73a84f53a551fb8b9334205af210a29874b2c
 F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54
@@ -792,7 +792,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5e472896e02eed05c6c0886a48acd0bdc7a38731
-R 204609ced7defe98357285940ebaac29
+P 0cc981f1ccc2c99b87eb968590ad18b2d3ebf37b
+R 97a48748b4b414fdba77f575c01c7ecd
 U drh
-Z b84420254e8669712066d9c952bf24d0
+Z ecb802955395b9fef6de3fc1f956d8d1

diff --git a/manifest.uuid b/manifest.uuid
index e7eda3d97896d89daa187e80c3be20cc954dc45c..cafddba1e4438295e41847c7a5adbcfa433f8a56 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0cc981f1ccc2c99b87eb968590ad18b2d3ebf37b
\ No newline at end of file
+27413fc8dd52b754b4be9344a66bb9e0d752d48e
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index e4bc1dec91cb104f29364128c592f6aaed52dc67..769e75df39ec62c85a4b0f5663e960bea4b1951c 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -128,11 +128,10 @@
 # else
 #  include <sys/file.h>
 #  include <sys/param.h>
-#  include <sys/mount.h>
 # endif
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
 # include <sys/mount.h>
 #endif