From: dan <dan@noemail.net>
Date: Fri, 17 Nov 2017 20:16:58 +0000 (+0000)
Subject: Add an 'extern "C"' wrapper to sqlite3_private.h.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d82c89d70c29e0062b6a60a6106ee60e5b148dfb;p=thirdparty%2Fsqlite.git

Add an 'extern "C"' wrapper to sqlite3_private.h.

FossilOrigin-Name: 97ab1efe4ef2c368949d07dd77af3982523685d6ae3837befb0dd442b30190a2
---

diff --git a/manifest b/manifest
index a7b307cf2f..639af8e6b3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\stest\sscript\sfixes\sfrom\strunk\sinto\sthis\sbranch.
-D 2017-11-17T20:10:12.906
+C Add\san\s'extern\s"C"'\swrapper\sto\ssqlite3_private.h.
+D 2017-11-17T20:16:58.295
 F Makefile.in 28a879888205a67bd3b54c68afa1cd2e939e8ead2179b1177756a101dd1eb86e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 9e7628ad7d33be39ac041e452e47e648ae3d14afbaaa254096e3a4d1d7c1c653
@@ -477,7 +477,7 @@ F src/select.c 17e220191860a64a18c084141e1a8b7309e166a6f2d42c02021af27ea080d157
 F src/shell.c.in a87f3094c1d2a07ed3f731409b33dbf36faf99157bfedb17855a664c60e1a909
 F src/sqlite.h.in d91e91266f023109e46160119cfd31490a11fe7006204dbf004f774b535fe1b8
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
+F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
 F src/sqliteInt.h c4e36ef253e69d1f5d2f39e5904f706f3760f8806654427ffeb6c4f4e5d1809e
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
@@ -1682,7 +1682,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 162c7543654c79138b94c3f631d0e4fa6cc77360574a5bb44695bf3333a0eaa0 c21406ab3281480d3eddca0cdf5aea3abc224425ee52c10eed3ff702a0ae5c26
-R 05a6d04d3e83894666cf2c8630471af1
+P 32f5f4613985283498162f2eaaba04316ee2f9ac6ce14bf238d36ebd16d55fa0
+R 6d9dc1cbc002c2b2b2df84b1adf7dbd0
 U dan
-Z 96e08d4c7de0b28e57fb4e8898f2ccd8
+Z 612bdb95bc52d809082d65d3eaf78f61
diff --git a/manifest.uuid b/manifest.uuid
index 926a598f3b..b9410e9efb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32f5f4613985283498162f2eaaba04316ee2f9ac6ce14bf238d36ebd16d55fa0
\ No newline at end of file
+97ab1efe4ef2c368949d07dd77af3982523685d6ae3837befb0dd442b30190a2
\ No newline at end of file
diff --git a/src/sqlite3_private.h b/src/sqlite3_private.h
index 29ad216138..03514c1f4e 100644
--- a/src/sqlite3_private.h
+++ b/src/sqlite3_private.h
@@ -5,6 +5,10 @@
 #ifndef _SQLITE3_PRIVATE_H
 #define _SQLITE3_PRIVATE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SQLITE_LOCKSTATE_OFF    0
 #define SQLITE_LOCKSTATE_ON     1
 #define SQLITE_LOCKSTATE_NOTADB 2
@@ -70,4 +74,7 @@ extern int _sqlite3_lockstate(const char *path, pid_t pid);
 #define SQLITE_FCNTL_REPLACE_DATABASE       102
 #define SQLITE_REPLACE_DATABASE             SQLITE_FCNTL_REPLACE_DATABASE
 
+#ifdef __cplusplus
+}  /* End of the 'extern "C"' block */
+#endif
 #endif