Back out the change to support Fuchsia, since it turns out fuchsia does not

like dot-file locks.

FossilOrigin-Name: 1d801a3b2c48dc8a918d6da047bc877acf033d5f5c4e1d4b412ba7678ed6f8b3

diff --git a/manifest b/manifest
index 59a1e01e868f41ecd2c96484980f708d784ebf91..37d0d55cac8c232c12d4bd12cecf8a3492ac0c87 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sdebugging\sprintf()\sleft\sin\stest/sessionfuzz.c.
-D 2019-03-15T18:57:49.909
+C Back\sout\sthe\schange\sto\ssupport\sFuchsia,\ssince\sit\sturns\sout\sfuchsia\sdoes\snot\nlike\sdot-file\slocks.
+D 2019-03-15T19:08:23.606
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 236d2739dc3e823c3c909bca2d6cef93009bafbefd7018a8f3281074ecb92954
@@ -499,7 +499,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 2b9604eb5c12f40a0613e832b6267f5814f84479d570d482ba6f98d7affa7c1c
+F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
 F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
@@ -1806,7 +1806,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0f2129f59f7df929106e2af876c2976dea6528c1dc1850d64cddb256f20e121a
-R cf3b6737b55e7f2c6cba64730dfa541b
-U dan
-Z 92b68b45672b080ac2ba5752753fcf1e
+P 73c4abc90264355f3ea6e8c34e5aad6ed665b70fb136c4d416e2a98e46562bbd
+Q -be21a6416d47ff7db995006a0422b745044d9b8bb5bad3c53342aa6e2e524771
+R a213c073daf803755a77adb42425f084
+U drh
+Z 2fc80787a186258407eabe023238e15d

diff --git a/manifest.uuid b/manifest.uuid
index 14a1c12813d27a030af4f8eb373c05c349b1c82f..1f5c03a35adb901f03f39d857e20da5b7567783e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73c4abc90264355f3ea6e8c34e5aad6ed665b70fb136c4d416e2a98e46562bbd
\ No newline at end of file
+1d801a3b2c48dc8a918d6da047bc877acf033d5f5c4e1d4b412ba7678ed6f8b3
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 4e434334b861cbc97cb444233df5aab31c7dcc48..f20763e5b0bc96dbdb7947ec6f919081d946c845 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -7822,9 +7822,6 @@ int sqlite3_os_init(void){
     UNIXVFS("unix",          autolockIoFinder ),
 #elif OS_VXWORKS
     UNIXVFS("unix",          vxworksIoFinder ),
-#elif __Fuchsia__
-    /* We are told that Fuchsia only supports dot-file locking */
-    UNIXVFS("unix",          dotlockIoFinder ),
 #else
     UNIXVFS("unix",          posixIoFinder ),
 #endif