From bd906e6753efd5ac404669f40331a3af080abf69 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 26 Jan 2016 15:55:17 +0000 Subject: [PATCH] Fix merge error. --- src/mosquitto_broker.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mosquitto_broker.h b/src/mosquitto_broker.h index 7dbeecea..a8e6202f 100644 --- a/src/mosquitto_broker.h +++ b/src/mosquitto_broker.h @@ -580,9 +580,9 @@ void service_run(void); * ============================================================ */ #ifdef WITH_WEBSOCKETS # if defined(LWS_LIBRARY_VERSION_NUMBER) -struct lws_context *mosq_websockets_init(struct _mqtt3_listener *listener, int log_level); +struct lws_context *mosq_websockets_init(struct mosquitto__listener *listener, int log_level); # else -struct libwebsocket_context *mosq_websockets_init(struct _mqtt3_listener *listener, int log_level); +struct libwebsocket_context *mosq_websockets_init(struct mosquitto__listener *listener, int log_level); # endif #endif void do_disconnect(struct mosquitto_db *db, struct mosquitto *context);