From 25499194132b10153ae357aa5b271d000a5429f3 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Mon, 21 Dec 2015 10:53:47 +0000
Subject: [PATCH 1/2] Fix support for libwebsockets 1.22.

---
 ChangeLog.txt            | 7 +++++++
 lib/net_mosq.c           | 1 -
 src/loop.c               | 1 -
 src/mosquitto.c          | 1 -
 src/mosquitto_broker.h   | 1 -
 src/read_handle_server.c | 1 -
 src/websockets.c         | 1 -
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b09168fc..2612b520 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+1.4.7 - 20151221
+================
+
+Broker:
+- Fix support for libwebsockets 1.22.
+
+
 1.4.6 - 20151220
 ================
 
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index a2db4b10..4c258a47 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -68,7 +68,6 @@ Contributors:
    extern unsigned long g_pub_msgs_sent;
 #  endif
 #  ifdef WITH_WEBSOCKETS
-#    include <lws_config.h>
 #    include <libwebsockets.h>
 #  endif
 #else
diff --git a/src/loop.c b/src/loop.c
index b3af85e1..a5f624b3 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -37,7 +37,6 @@ Contributors:
 #include <time.h>
 
 #ifdef WITH_WEBSOCKETS
-#  include <lws_config.h>
 #  include <libwebsockets.h>
 #endif
 
diff --git a/src/mosquitto.c b/src/mosquitto.c
index 0bedfd34..eaf43953 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -43,7 +43,6 @@ Contributors:
 #include <tcpd.h>
 #endif
 #ifdef WITH_WEBSOCKETS
-#  include <lws_config.h>
 #  include <libwebsockets.h>
 #endif
 
diff --git a/src/mosquitto_broker.h b/src/mosquitto_broker.h
index 7e4e6549..8d197901 100644
--- a/src/mosquitto_broker.h
+++ b/src/mosquitto_broker.h
@@ -21,7 +21,6 @@ Contributors:
 #include <stdio.h>
 
 #ifdef WITH_WEBSOCKETS
-#  include <lws_config.h>
 #  include <libwebsockets.h>
 
 #  if defined(LWS_LIBRARY_VERSION_NUMBER)
diff --git a/src/read_handle_server.c b/src/read_handle_server.c
index 8b0df1be..2e35aaa3 100644
--- a/src/read_handle_server.c
+++ b/src/read_handle_server.c
@@ -32,7 +32,6 @@ Contributors:
 #endif
 
 #ifdef WITH_WEBSOCKETS
-#  include <lws_config.h>
 #  include <libwebsockets.h>
 #endif
 
diff --git a/src/websockets.c b/src/websockets.c
index 2c6f2c81..6e641af2 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef WITH_WEBSOCKETS
 
-#include <lws_config.h>
 #include <libwebsockets.h>
 #include "mosquitto_internal.h"
 #include "mosquitto_broker.h"

From a7136b3672e65df546cbd38a59742f558a108b01 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Mon, 21 Dec 2015 11:32:41 +0000
Subject: [PATCH 2/2] Bump version number.

---
 CMakeLists.txt                 | 2 +-
 config.mk                      | 2 +-
 installer/mosquitto-cygwin.nsi | 2 +-
 installer/mosquitto.nsi        | 2 +-
 lib/mosquitto.h                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e52539c4..086d9179 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 2.8)
 # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.4.6)
+set (VERSION 1.4.7)
 
 if (WIN32)
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
diff --git a/config.mk b/config.mk
index b89932c4..01532c3c 100644
--- a/config.mk
+++ b/config.mk
@@ -83,7 +83,7 @@ WITH_SOCKS:=yes
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.4.6
+VERSION=1.4.7
 TIMESTAMP:=$(shell date "+%F %T%z")
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
diff --git a/installer/mosquitto-cygwin.nsi b/installer/mosquitto-cygwin.nsi
index 46575550..f87fca57 100644
--- a/installer/mosquitto-cygwin.nsi
+++ b/installer/mosquitto-cygwin.nsi
@@ -7,7 +7,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "mosquitto"
-!define VERSION 1.4.6
+!define VERSION 1.4.7
 OutFile "mosquitto-${VERSION}-install-cygwin.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
index d514c925..9e01367e 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "mosquitto"
-!define VERSION 1.4.6
+!define VERSION 1.4.7
 OutFile "mosquitto-${VERSION}-install-win32.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/lib/mosquitto.h b/lib/mosquitto.h
index 234d407a..d279f063 100644
--- a/lib/mosquitto.h
+++ b/lib/mosquitto.h
@@ -45,7 +45,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 1
 #define LIBMOSQUITTO_MINOR 4
-#define LIBMOSQUITTO_REVISION 6
+#define LIBMOSQUITTO_REVISION 7
 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */
 #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)