Fix the amalgamation generator to recognize indented #include directives.

Ticket #3438. (CVS 5822)

FossilOrigin-Name: 494510d8f25c69f5a5f5937b92f505849def6745

diff --git a/manifest b/manifest
index 852e87683d9595d07fd53d3fd5ab9c924979e4a9..9dd0ee589a1880d5a2bec9e688b67df073fc3dd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sxRandomness()\smethod\son\sthe\sunix\sVFS\sto\sreturn\sthe\snumber\sof\sbytes\nof\srandomness\sobtained.\s(CVS\s5821)
-D 2008-10-14T17:58:38
+C Fix\sthe\samalgamation\sgenerator\sto\srecognize\sindented\s#include\sdirectives.\nTicket\s#3438.\s(CVS\s5822)
+D 2008-10-14T18:21:12
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -633,7 +633,7 @@ F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c c219ee2b8b5b8e7011cccfa1caec62d9812e82e7
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl f74c5aacea1668dcf4ac0b75f3e1830942b733f6
+F tool/mksqlite3c.tcl 8aff2d49beb7d94a63841e86f3ffd4770e5054aa
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 603c40e5b47e4798136af5420a1fa1511791a934
-R 616d48a51ad6a11056acefff803f6a5c
+P b7687e2f2dfa5b0a01ba87ae0bf13684cda50499
+R 1f6c0b9d3fccbdf8267da4e426481485
 U drh
-Z 70ed6965e1e26d017ef8310705fad386
+Z c4f72c13f0e8707a11060afc6767044e

diff --git a/manifest.uuid b/manifest.uuid
index 41156bad4448918a82d107869f2f0525f58a3354..72bc5dc994727096e4f2273d9dc22e168e6a5a2e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7687e2f2dfa5b0a01ba87ae0bf13684cda50499
\ No newline at end of file
+494510d8f25c69f5a5f5937b92f505849def6745
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index bf8ce16070d3bd9910a32315e0f2315588b85899..1dd54e4a04f975e2c0674abc046139d9cb22e6f8 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -146,7 +146,7 @@ proc copy_file {filename} {
   set declpattern ^$declpattern
   while {![eof $in]} {
     set line [gets $in]
-    if {[regexp {^#\s*include\s+["<]([^">]+)[">]} $line all hdr]} {
+    if {[regexp {^\s*#\s*include\s+["<]([^">]+)[">]} $line all hdr]} {
       if {[info exists available_hdr($hdr)]} {
         if {$available_hdr($hdr)} {
           if {$hdr!="os_common.h" && $hdr!="hwtime.h"} {