Fix the amalgamation so that it can be compiled with REDEF_IO enabled. (CVS 3782)

FossilOrigin-Name: 6a3d6142d8be18bf2a9913f0329bcce48867304b

diff --git a/manifest b/manifest
index 4bc7fadeb22593a428453e5ef2fd172d35660b90..8bf4ae9509286c008640566b244a0d1385e6a3af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\stest\scoverage\sby\sstatically\sdefining\sSQLITE_BIGENDIAN\sand\srelated\nmacros\sfor\six86\splatforms.\s\sStill\sa\srun-time\stest\sfor\sother\sarchitectures.\nNeed\sto\sadd\sadditional\scases\sto\scover\sother\spopular\sprocessors.\s(CVS\s3781)
-D 2007-03-31T15:28:00
+C Fix\sthe\samalgamation\sso\sthat\sit\scan\sbe\scompiled\swith\sREDEF_IO\senabled.\s(CVS\s3782)
+D 2007-03-31T16:29:06
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -382,7 +382,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 ca566a1482d187433f3aea97a83a1ca9fb6af071
+F tool/mksqlite3c.tcl 72969469d0487df1b1b50dfc7a2be56a2a193168
 F tool/omittest.tcl e6b3d6a1285f9813bc1dea53bb522b4b72774710
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
@@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P c2badb208ff1207a1471410965947893b070ea50
-R 204431f7b2bb34a948b344e8b3edd416
+P 476e7c3fcc69d8b21d161c758aaa5ef7163abb15
+R bf353a147116ca034c191387f8be374c
 U drh
-Z 95c9850a4ecd3943084703787ef0d36a
+Z e7a7582e202988b95ca76eab2f374fb0

diff --git a/manifest.uuid b/manifest.uuid
index f88ff3c16a6c035798d6ceede61cd7ccf635cac7..54315d7d000ea66d60f02130cad792f00dbd9270 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-476e7c3fcc69d8b21d161c758aaa5ef7163abb15
\ No newline at end of file
+6a3d6142d8be18bf2a9913f0329bcce48867304b
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index d13532540b4e3b04294b561e4b37f71ea7d49d6a..deb77979a8a332afa00643fbb52e5826db544584 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -105,6 +105,8 @@ proc copy_file {filename} {
 # inlining opportunities.
 #
 foreach file {
+   os.c
+
    printf.c
    random.c
    utf.c
@@ -112,7 +114,6 @@ foreach file {
    hash.c
    opcodes.c
 
-   os.c
    os_os2.c
    os_unix.c
    os_win.c