From 1ed93e9085ea02cd37db400f56ed52227e12ab79 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Thu, 21 May 2009 04:42:19 +0000 Subject: [PATCH] Add conditional 'extern "C"' block to sqlite3async.h. Ticket #3866. (CVS 6662) FossilOrigin-Name: e4d1b117c90dca341bfa74291c7dfc2afca38cc6 --- ext/async/sqlite3async.h | 10 ++++++++++ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ext/async/sqlite3async.h b/ext/async/sqlite3async.h index 100dfff0fc..143cdc7703 100644 --- a/ext/async/sqlite3async.h +++ b/ext/async/sqlite3async.h @@ -2,6 +2,13 @@ #ifndef __SQLITEASYNC_H_ #define __SQLITEASYNC_H_ 1 +/* +** Make sure we can call this stuff from C++. +*/ +#ifdef __cplusplus +extern "C" { +#endif + #define SQLITEASYNC_VFSNAME "sqlite3async" /* @@ -209,5 +216,8 @@ int sqlite3async_control(int op, ...); #define SQLITEASYNC_HALT_NOW 1 /* Halt as soon as possible */ #define SQLITEASYNC_HALT_IDLE 2 /* Halt when write-queue is empty */ +#ifdef __cplusplus +} /* End of the 'extern "C"' block */ +#endif #endif /* ifndef __SQLITEASYNC_H_ */ diff --git a/manifest b/manifest index 69cc83edd0..9b634913f1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\smemory\sleak\sthat\soccurs\swhen\san\sout-of-memory\serror\soccurs\swhile\npreparing\sa\sstatement\sthat\shas\smultiple\svirtual\stable\supdates\swithin\ntriggers.\s\sOther\svirtual\stable\schanges\sto\ssupport\sfull-coverage\stesting.\s(CVS\s6661) -D 2009-05-20T20:10:47 +C Add\sconditional\s'extern\s"C"'\sblock\sto\ssqlite3async.h.\sTicket\s#3866.\s(CVS\s6662) +D 2009-05-21T04:42:19 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -26,7 +26,7 @@ F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1 F ext/async/README.txt 0c541f418b14b415212264cbaaf51c924ec62e5b F ext/async/sqlite3async.c a10dd8add8544c62faf1b6eccb6b1e535b5e7cad -F ext/async/sqlite3async.h b6d74dbf9aa5a0ac4e79aa15a4d987f3552a0f75 +F ext/async/sqlite3async.h a21e1252deb14a2c211f0e165c4b9122a8f1f344 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b F ext/fts1/ft_hash.h 1a35e654a235c2c662d3ca0dfc3138ad60b8b7d5 @@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 55d6ced262f5281076e4a68097ed21e150a9c225 -R 746ae05c43433a273890f71e50932349 -U drh -Z b6bf88ddaf7ac2f73c27614c2e34432b +P 02b77a582c65e0eb45eb1a9abbdeef11f52d7ce6 +R 5dee58232ac007b699cd00a9ed856dbe +U danielk1977 +Z 54642730f8a50d1656fd2e466c93cfd5 diff --git a/manifest.uuid b/manifest.uuid index bc9d718b51..921be98f7c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -02b77a582c65e0eb45eb1a9abbdeef11f52d7ce6 \ No newline at end of file +e4d1b117c90dca341bfa74291c7dfc2afca38cc6 \ No newline at end of file