Fix some compilation issues.

FossilOrigin-Name: 016481b39f8b23b4f0f851053068d8eaee6122e1

diff --git a/manifest b/manifest
index 2ba8a3c8f7a441ca9cd8ab6fa602998335001619..c7a5b46f3b78a8eb41e7c12c3b2ab31a9167f06c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2016-04-05T17:59:56.435
+C Fix\ssome\scompilation\sissues.
+D 2016-04-11T22:10:26.085
 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
@@ -13,7 +13,7 @@ F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40
 F autoconf/Makefile.msc dc0d0500e4a827cb3891d08d846dd6dd40241b51
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
-F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1 w autoconf/README
+F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff
 F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
@@ -360,7 +360,7 @@ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
-F src/os_win.c be21cb97d7c679a27851d85c26ddc3a80ffb2ec5
+F src/os_win.c 1245c1c1b03f269f8beca1464df2f9a174236dab
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
@@ -380,7 +380,7 @@ F src/shell.c b7922fa264f8c8d72a5ec6dd0b091e15a93c4de5
 F src/sqlite.h.in 7f437b068314f053e6417d452c59f08d05092591
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
-F src/sqliteInt.h 8da202a3a7874497db07fae72c1f94ca6522a6c3
+F src/sqliteInt.h 594bf31a7a0cc788688ca947e562576e23bd7904
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@ -1012,7 +1012,7 @@ F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
 F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
-F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
+F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
 F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
 F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@ -1378,7 +1378,7 @@ F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
 F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
 F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
-F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
+F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
 F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@ -1482,7 +1482,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 39759a553208d8ef72964bdd539a0883e1d99cf6 cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0
-R d0ec40008a4450baf3f01589e83f54d1
+P 00990020d07d7c87b922cdbfa5373298a86bb4b3
+R b5c956e1077b7c3e444e8f4ed923bce8
 U mistachkin
-Z eaa4bb84d513df9cfd663fcd7451f96e
+Z 76d8e561edd13c0c75a00b4aec6f1897

diff --git a/manifest.uuid b/manifest.uuid
index 7454ecb7b8ef2ac45ef59e8976be4f4336b7b277..1b336070508fe92f5cd0a054bbed5aac7b77b05f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00990020d07d7c87b922cdbfa5373298a86bb4b3
\ No newline at end of file
+016481b39f8b23b4f0f851053068d8eaee6122e1
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 518155d037fd7e55d98072801b95eb064ccc1968..698c5af86113ba797c526cc098178253459309c4 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -25,6 +25,16 @@
 */
 #include "os_win.h"
 
+/*
+** The MSVC CRT on Windows CE may not have a localtime() function.  So
+** declare a substitute.
+*/
+#if SQLITE_OS_WINCE && \
+    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
+#  include <time.h>
+struct tm *__cdecl localtime(const time_t *);
+#endif
+
 /*
 ** Compiling and using WAL mode requires several APIs that are only
 ** available in Windows platforms based on the NT kernel.
@@ -2118,16 +2128,12 @@ static void winLogIoerr(int nRetry, int lineno){
   }
 }
 
-/*
-** This #if cannot use SQLITE_OS_WINCE because the corresponding section
-** in "sqliteInt.h" does not use it.
-*/
-#if defined(_WIN32_WCE) && \
-    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
 /*
 ** The MSVC CRT on Windows CE may not have a localtime() function.  So
-** create a substitute.
+** define a substitute.
 */
+#if SQLITE_OS_WINCE && \
+    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
 struct tm *__cdecl localtime(const time_t *t)
 {
   static struct tm y;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 8a4aa378fa2f6a966ad9660243a97a707c6f7c77..d789cc00e49aa07ec8f1eba69db987393e0652b8 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -211,16 +211,6 @@
 #  endif
 #endif
 
-/*
-** The MSVC CRT on Windows CE may not have a localtime() function.  So
-** declare a substitute.  The function itself is defined in "os_win.c".
-*/
-#if defined(_WIN32_WCE) && \
-    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
-#  include <time.h>
-struct tm *__cdecl localtime(const time_t *);
-#endif
-
 /*
 ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 ** 0 means mutexes are permanently disable and the library is never