In the amalgamation, put date.c before os.c so that the time_t typedef

can be correctly resolved by windows compilers. (CVS 3793)

FossilOrigin-Name: 9c5697c70fa850ea700e8cc0c918791a1628ab10

diff --git a/manifest b/manifest
index 3e202f83d2970a9bb1472492bd96b3e209636786..3c59f9a62a6948efc7ab09d04f3d30a101c65444 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\san\sIO\serror\sis\sencountered\son\sa\scommit,\sclose\sthe\sjournal\sso\sthat\sit\npersists\sand\scan\s(hopefully)\srollback\sthe\sfailed\stransaction\slater.\s(CVS\s3792)
-D 2007-04-02T11:22:22
+C In\sthe\samalgamation,\sput\sdate.c\sbefore\sos.c\sso\sthat\sthe\stime_t\stypedef\ncan\sbe\scorrectly\sresolved\sby\swindows\scompilers.\s(CVS\s3793)
+D 2007-04-02T12:22:45
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -383,7 +383,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c 520d0016eaac0d783ea8ffb7f91d150d0bf06e81
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl 85514e8a74425a614eb83766a8adacf89eef005c
+F tool/mksqlite3c.tcl ea7a08c3a87e47031bcefccde4e641914d013a99
 F tool/omittest.tcl e6b3d6a1285f9813bc1dea53bb522b4b72774710
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
@@ -448,7 +448,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4d8c6bf44ec00ec04e615983cb33425ca2c3998a
-R b60be37f8194d17dcc865a186ba19df6
+P 22e10cc24e4407feb276abfa8cc9964f20c6e54a
+R 42c2a9ca309cb4860ceac1f3ae68c7dd
 U drh
-Z 36541dd9060dc60ff27a9aed65ba02c4
+Z 73b20471719a288f5e4588a1c14d182d

diff --git a/manifest.uuid b/manifest.uuid
index 7e35a411b886b3e2b807352aba30e3ed325d88a1..fe8dbdcadf72be09314c6b8a80d1c91c2abb0927 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22e10cc24e4407feb276abfa8cc9964f20c6e54a
\ No newline at end of file
+9c5697c70fa850ea700e8cc0c918791a1628ab10
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index f2a521638b292bcde2096982b66ca2914e0306bc..d58206bc6202b4550517bee99d62c0bf74eb4a99 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -148,6 +148,7 @@ proc copy_file {filename} {
 foreach file {
    sqlite3.h
 
+   date.c
    os.c
 
    printf.c
@@ -179,7 +180,6 @@ foreach file {
    build.c
    callback.c
    complete.c
-   date.c
    delete.c
    func.c
    insert.c