From 1b7e5d2b0b17382019d637490e1890e3d4c4dc00 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 7 Sep 2022 19:58:48 +0000 Subject: [PATCH] Fix the windows build so that it works with -DSQLITE_OMIT_AUTOINIT. FossilOrigin-Name: 1662eb07d8fa01457b3e3f37894234aae27c25a67059da968ab8cb599d3bd8f6 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os_win.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 162048dd8a..18a032ded5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sthe\sRekey()\soperation\sdoes\snot\soverwrite\san\sexisting\spage\snumber. -D 2022-09-07T19:50:06.604 +C Fix\sthe\swindows\sbuild\sso\sthat\sit\sworks\swith\s-DSQLITE_OMIT_AUTOINIT. +D 2022-09-07T19:58:48.936 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -555,7 +555,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c e020676e334a0a78c3affb7dd1789a240071ed6af98309f1bef76948cb8382bd -F src/os_win.c d55025aeb5b36b5d92d7c09fe709edaf2be901420782540ba4adad86729636a0 +F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 8c3853cad320c24904a2f970777bbdda2deb9572f53e6a1d73b28b85a7fd30cc F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3 @@ -1978,9 +1978,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e98bed127db003c4ea34d8ca331b29a0256d9073c27a3e914f02030c1b0af77c -Q +7dbddde79e3ca1b81e00288616fc27434698ce6dcb47714728fce8602ae91f45 -R 0919396b7e25bc26dd82ac2ddf61d86a +P cd1e40064ccd9fe2189feb4fd3b77be265990baba8be3d53256b85716650f5bc +Q +f74a5ea8c986dc33d3afcda169c38abbe55728c56716cf9991a5e2ef7fc4917a +R ae2c8470dbee646449a5a3daa1d17770 U drh -Z 5950b380ad0ec9ddb65d593cf90e052d +Z 2cc129aa89c925564d469314dc44b7cf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a2d289bc6c..37140402bf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cd1e40064ccd9fe2189feb4fd3b77be265990baba8be3d53256b85716650f5bc \ No newline at end of file +1662eb07d8fa01457b3e3f37894234aae27c25a67059da968ab8cb599d3bd8f6 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 4191db6bb7..2827b0b49b 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1918,8 +1918,9 @@ int sqlite3_win32_set_directory8( const char *zValue /* New value for directory being set or reset */ ){ char **ppDirectory = 0; + int rc; #ifndef SQLITE_OMIT_AUTOINIT - int rc = sqlite3_initialize(); + rc = sqlite3_initialize(); if( rc ) return rc; #endif sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR)); -- 2.47.2