From 4c997c6e751909cfc2caa6b7bc187fa6da4ba2fa Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 13 Jul 2017 17:56:52 +0000 Subject: [PATCH] Fix an incorrect type signature for the loadable extension pointer for sqlite3_result_pointer(). FossilOrigin-Name: 0bd7875bd9948836a14061275eb8ddac627f562a49f59f400ec98c00e2be82c5 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite3ext.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 8740c2c081..198d4d2a4b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sthree\snew\spointer\sinterfaces\sto\sthe\sloadable\sextension\smechanism.\nUpdate\ssqlite3_value_subtype()\sdocumentation\sto\sremove\sthe\sstatement\sabout\nit\snot\sbeing\sused\sinternally. -D 2017-07-13T17:54:12.238 +C Fix\san\sincorrect\stype\ssignature\sfor\sthe\sloadable\sextension\spointer\nfor\ssqlite3_result_pointer(). +D 2017-07-13T17:56:52.837 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -454,7 +454,7 @@ F src/shell.c 0401a716fc5343594b8ee60ce065d9a71373d3403f0b81f9fed684741e6401d1 F src/shell.c.in 98bfdeeb0808418b37f59e6d380568a76e0733efe2494377096f434b39940cad F src/sqlite.h.in 77f4bee882ad4999bf04cf011e1c4cd7f1c6488e290764f3fb46833810447c5d F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 -F src/sqlite3ext.h 635712b4108d3ac526a4821d646e9f40f831277ecdb004e73b31f00f3f413493 +F src/sqlite3ext.h 654d76dd288780a460be9c88edc6a5eb2d61df03a7153c92f1d87aba41f73b96 F src/sqliteInt.h 0ba730cdc8afa723a5642380712f8bb33abd6a69218571c18b94acf3562de22a F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 @@ -1631,7 +1631,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 0fa2e170e5e078d155c98b212ade36bd8424502ae07f2d82ebf77a76f57586ba -R 138dbbf6db8f3af3b160229e048b5334 +P e5a518038fcb23376d2b17d4d70648320bc5540c5bd8b164201044ebe1ce45c5 +R c5909f0683f2365e40f92a217eed2222 U drh -Z a38953a262acd0f45b83dd587cf33d77 +Z 36e4bbc5bdc1a46b79fe430f87487a42 diff --git a/manifest.uuid b/manifest.uuid index 4864423525..0f75f066f8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e5a518038fcb23376d2b17d4d70648320bc5540c5bd8b164201044ebe1ce45c5 \ No newline at end of file +0bd7875bd9948836a14061275eb8ddac627f562a49f59f400ec98c00e2be82c5 \ No newline at end of file diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index e866a6eb64..8d254b236b 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -290,7 +290,7 @@ struct sqlite3_api_routines { int (*prepare16_v3)(sqlite3*,const void*,int,unsigned int, sqlite3_stmt**,const void**); int (*bind_pointer)(sqlite3_stmt*,int,void*); - int (*result_pointer)(sqlite3_context*,void*); + void (*result_pointer)(sqlite3_context*,void*); void *(*value_pointer)(sqlite3_value*); }; -- 2.39.5