From: drh <drh@noemail.net>
Date: Mon, 22 May 2017 13:06:45 +0000 (+0000)
Subject: Include the "msvc.h" header file in the amalgamation tarball.
X-Git-Tag: version-3.19.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44ec1d6edaac87ed3470980c884ba609c1f2d2dd;p=thirdparty%2Fsqlite.git

Include the "msvc.h" header file in the amalgamation tarball.

FossilOrigin-Name: 3dd6fe53c7ae6ebe2393e956d040e00b8cd0589674d20aafe1585aaa61325bbe
---

diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
index e8211596d9..a1d8f59efd 100644
--- a/autoconf/Makefile.am
+++ b/autoconf/Makefile.am
@@ -12,7 +12,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
 sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
-include_HEADERS = sqlite3.h sqlite3ext.h
+include_HEADERS = sqlite3.h sqlite3ext.h msvc.h
 
 EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
 pkgconfigdir = ${libdir}/pkgconfig
diff --git a/manifest b/manifest
index 7b0500a7ac..c8d1cd13f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sa\spossible\sNULL\spointer\sdereference\sin\sthe\sOP_Found\sopcode\sthat\ncan\sfollow\san\sOOM\serror.\s\sProblem\sfound\sby\sOSS-Fuzz.
-D 2017-05-19T23:04:04.031
+C Include\sthe\s"msvc.h"\sheader\sfile\sin\sthe\samalgamation\starball.
+D 2017-05-22T13:06:45.288
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -10,7 +10,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
-F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
+F autoconf/Makefile.am ed95854f5df64c1d0a447d8ecb55edc67e3c32f79f597c3a4870f9ac51698275
 F autoconf/Makefile.msc 1014be616b420a5f48611d21b62ca2f50ec97ee795087ecb8a4d6bf6375ba11d
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
@@ -1512,7 +1512,7 @@ F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
-F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
+F tool/mkautoconfamal.sh ab527af92dc684028e0d1db3fa6241787fae78987b99e5bbac7eb87e1970b8e5
 F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
 F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
@@ -1580,8 +1580,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 f2b829ec52c2037eba4feb9427c56d84aca736cb5fc841dfe91cfff22cf660c1
-Q +c2de178fe7e2e4e0d764e7e6ac637cfc8c053580c43f7246318dafad2974de3c
-R fa3de8848fde01ec07b6ff80f323523f
+P 50ad60ded54aa22dfdf519ed5da6451de790e22a972ff299f7976fbdce7a0579
+R 70185df2307fdc4359181caa65daa887
 U drh
-Z 8ada4e4e3a5f42b8890ba86493cb429e
+Z 0303a77637cd34b7c34820a37ec20c26
diff --git a/manifest.uuid b/manifest.uuid
index bf1abc06e9..7429bc11a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50ad60ded54aa22dfdf519ed5da6451de790e22a972ff299f7976fbdce7a0579
\ No newline at end of file
+3dd6fe53c7ae6ebe2393e956d040e00b8cd0589674d20aafe1585aaa61325bbe
\ No newline at end of file
diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index 4864ee85c3..4a1730b626 100644
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -51,6 +51,7 @@ cp sqlite3.h              $TMPSPACE
 cp sqlite3ext.h           $TMPSPACE
 cp $TOP/sqlite3.1         $TMPSPACE
 cp $TOP/sqlite3.pc.in     $TMPSPACE
+cp $TOP/src/msvc.h        $TMPSPACE
 cp $TOP/src/shell.c       $TMPSPACE
 cp $TOP/src/sqlite3.rc    $TMPSPACE
 cp $TOP/tool/Replace.cs   $TMPSPACE