From ac6997d7bc267f15928795f447f5430919bc711a Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 19 Jul 2017 14:49:49 +0100
Subject: [PATCH] Fix merge error.

---
 src/mosquitto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mosquitto.c b/src/mosquitto.c
index ad28bec9..c160e75c 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -375,12 +375,12 @@ int main(int argc, char *argv[])
 #endif
 
 	HASH_ITER(hh_id, int_db.contexts_by_id, ctxt, ctxt_tmp){
-		mqtt3_context_send_will(&int_db, ctxt);
+		context__send_will(&int_db, ctxt);
 	}
 
 #ifdef WITH_PERSISTENCE
 	if(config.persistence){
-		mqtt3_db_backup(&int_db, true);
+		persist__backup(&int_db, true);
 	}
 #endif