Commit 57561bb1 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix compilation error with no sqlite support

parent 9ae188f4
......@@ -373,8 +373,6 @@ void linphone_core_call_log_storage_init(LinphoneCore *lc) {
int ret;
const char *errmsg;
sqlite3 *db;
sqlite3_bctbx_vfs_register(1);
linphone_core_call_log_storage_close(lc);
......
......@@ -1138,7 +1138,7 @@ void linphone_core_friends_storage_init(LinphoneCore *lc) {
const char *errmsg;
sqlite3 *db;
const MSList *friends_lists = NULL;
sqlite3_bctbx_vfs_register(1);
linphone_core_friends_storage_close(lc);
ret = _linphone_sqlite3_open(lc->friends_db_file, &db);
......
......@@ -26,6 +26,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "lime.h"
#include "conference_private.h"
#ifdef SQLITE_STORAGE_ENABLED
#include "sqlite3_bctbx_vfs.h"
#endif
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -1777,6 +1781,9 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
if (remote_provisioning_uri == NULL) {
linphone_configuring_terminated(lc, LinphoneConfiguringSkipped, NULL);
} // else linphone_core_start will be called after the remote provisioning (see linphone_core_iterate)
#ifdef SQLITE_STORAGE_ENABLED
sqlite3_bctbx_vfs_register(1);
#endif
}
LinphoneCore *linphone_core_new(const LinphoneCoreVTable *vtable,
......
......@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/msvideo.h"
#include "mediastreamer2/mediastream.h"
#include "mediastreamer2/bitratecontrol.h"
#include "sqlite3_bctbx_vfs.h"
#ifdef IN_LINPHONE
#include "sipsetup.h"
......
......@@ -25,6 +25,7 @@
#define MAX_LEN 16384
#include "linphonecore.h"
#include "bctoolbox/bc_vfs.h"
#include <stdio.h>
#include <stdlib.h>
......
......@@ -662,7 +662,7 @@ void linphone_core_message_storage_init(LinphoneCore *lc){
int ret;
const char *errmsg;
sqlite3 *db = NULL;
sqlite3_bctbx_vfs_register(1);
linphone_core_message_storage_close(lc);
ret=_linphone_sqlite3_open(lc->chat_db_file,&db);
......
......@@ -38,6 +38,7 @@
#include "vcard.h"
#include <bctoolbox/port.h>
#include <bctoolbox/bc_vfs.h>
#include <belle-sip/object.h>
#include <belle-sip/dict.h>
......@@ -53,9 +54,6 @@
#include "upnp.h"
#endif //BUILD_UPNP
#ifdef SQLITE_STORAGE_ENABLED
#include "sqlite3.h"
#endif
#ifndef LIBLINPHONE_VERSION
#define LIBLINPHONE_VERSION LINPHONE_VERSION
......@@ -123,6 +121,11 @@
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
#ifdef SQLITE_STORAGE_ENABLED
#include <sqlite3.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
......
......@@ -17,15 +17,18 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef sqlite3_bctx_vfs_h
#define sqlite3_bctx_vfs_h
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdbool.h>
#include "sqlite3.h"
#include <bctoolbox/bc_vfs.h>
#include "sqlite3.h"
/*
** The maximum pathname length supported by this VFS.
......@@ -62,4 +65,6 @@ VFS API to register this VFS to sqlite3 VFS
*****************************************************/
sqlite3_vfs *sqlite3_bctbx_vfs_create(void);
void sqlite3_bctbx_vfs_register(int makeDefault);
void sqlite3_bctbx_vfs_unregister(void);
\ No newline at end of file
void sqlite3_bctbx_vfs_unregister(void);
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment