fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-02-13 19:34:38 +00:00
parent 0d308ffa2e
commit 6585cfca2c
14 changed files with 75 additions and 32 deletions

View file

@ -32,7 +32,10 @@
#include "rsdbbind.h"
//#define RETRODB_DEBUG
#ifndef NO_SQLCIPHER
#define ENABLE_ENCRYPTED_DB
#endif
const int RetroDb::OPEN_READONLY = SQLITE_OPEN_READONLY;
const int RetroDb::OPEN_READWRITE = SQLITE_OPEN_READWRITE;

View file

@ -24,7 +24,11 @@
*
*/
#ifdef NO_SQLCIPHER
#include <sqlite3.h>
#else
#include <sqlcipher/sqlite3.h>
#endif
#include <string>
#include <set>

View file

@ -26,7 +26,12 @@
#include <string>
#include <inttypes.h>
#ifdef NO_SQLCIPHER
#include <sqlite3.h>
#else
#include <sqlcipher/sqlite3.h>
#endif
class RetroBind
{