From: drh <drh@noemail.net>
Date: Wed, 25 Jan 2017 13:54:27 +0000 (+0000)
Subject: Fix SQLITEINT_H macro usage in two extensions.
X-Git-Tag: version-3.17.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=666d34c791536557855c3efd58a9a1c3ec7e59a0;p=thirdparty%2Fsqlite.git

Fix SQLITEINT_H macro usage in two extensions.

FossilOrigin-Name: 0803390c152141c9ab4e7a28406b2a5d72a5c2fa
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 327ad57500..3063f9f261 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -22,7 +22,7 @@
 ** how JSONB might improve on that.)
 */
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1)
-#if !defined(_SQLITEINT_H_)
+#if !defined(SQLITEINT_H)
 #include "sqlite3ext.h"
 #endif
 SQLITE_EXTENSION_INIT1
diff --git a/ext/userauth/userauth.c b/ext/userauth/userauth.c
index 6ce99053d3..a3d346c05c 100644
--- a/ext/userauth/userauth.c
+++ b/ext/userauth/userauth.c
@@ -22,7 +22,7 @@
 ** directory as this file for additional information.
 */
 #ifdef SQLITE_USER_AUTHENTICATION
-#ifndef _SQLITEINT_H_
+#ifndef SQLITEINT_H
 # include "sqliteInt.h"
 #endif
 
diff --git a/manifest b/manifest
index f8cd52fc5b..01c84dc4e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Document\sthe\s--mmap\soption\sin\sthe\s--help\sscreen\sfor\skvtest.\s\sEnhance\skvtest\sso\nthat\snumeric\sarguments\scan\shave\ssuffixes\slike\s"K"\sor\s"M".\s\sAdd\skvtest\sto\sthe\nunix\smakefiles.
-D 2017-01-23T19:11:38.113
+C Fix\sSQLITEINT_H\smacro\susage\sin\stwo\sextensions.
+D 2017-01-25T13:54:27.195
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -213,7 +213,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c e0797ef1bfa637429ceab9140ecba620809ee02a
+F ext/misc/json1.c 552a7d730863419e05dc947265b28bd411680e2e
 F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
@@ -310,7 +310,7 @@ F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2
 F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
-F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
+F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1547,7 +1547,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 4948f7e6d2a1cfce36a7aab2f5b65be07c285ac3
-R 9f530d22e2b0a16555eacd054431a10f
+P 175bda87288c7ce15b163316159f53a60822ccad
+R a9fb164433cc898aa04fd742715e395e
 U drh
-Z 4864426d37a32c6f04be82da7889e371
+Z 35bb9e1641d0b89bf56f9577622d86ef
diff --git a/manifest.uuid b/manifest.uuid
index 82e31c7d74..94c54c55e9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-175bda87288c7ce15b163316159f53a60822ccad
\ No newline at end of file
+0803390c152141c9ab4e7a28406b2a5d72a5c2fa
\ No newline at end of file