Merge latest trunk changes with this branch.

FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198
2015-01-01 18:03:49 +00:00
parent 6024772ba2 a0de826c9f
commit 37db72f1f7
273 changed files with 24765 additions and 6748 deletions
@@ -214,7 +214,7 @@ proc copy_file {filename} {
        }
      } elseif {[regexp {^(SQLITE_EXTERN )?void \(\*sqlite3IoTrace\)} $line]} {
        regsub {^SQLITE_EXTERN } $line {} line
-        puts $out "SQLITE_PRIVATE $line"
+        puts $out $line
      } elseif {[regexp {^void \(\*sqlite3Os} $line]} {
        puts $out "SQLITE_PRIVATE $line"
      } else {
@@ -255,6 +255,7 @@ foreach file {
   malloc.c
   printf.c
   random.c
+   threads.c
   utf.c
   util.c
   hash.c