Attachment #184476 for bug #220827

View | Details | Raw Unified | Return to bug 220827
Collapse All | Expand All




--- lib/mosquitto_internal.h.orig	2017-07-18 16:25:21 UTC
+++ lib/mosquitto_internal.h
@@ -30,11 +30,7 @@ Contributors:
 #endif
 #include <stdlib.h>

-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
-#  include <pthread.h>
-#else
-#  include <dummypthread.h>
-#endif
+#include <pthread.h>

 #ifdef WITH_SRV
 #  include <ares.h>
@@ -184,7 +180,7 @@ struct mosquitto {
 #endif
 	bool want_write;
 	bool want_connect;
-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
+
 	pthread_mutex_t callback_mutex;
 	pthread_mutex_t log_callback_mutex;
 	pthread_mutex_t msgtime_mutex;
@@ -195,7 +191,7 @@ struct mosquitto {
 	pthread_mutex_t out_message_mutex;
 	pthread_mutex_t mid_mutex;
 	pthread_t thread_id;
-#endif
+
 	bool clean_session;
 #ifdef WITH_BROKER
 	bool is_dropping;




--- src/CMakeLists.txt.orig	2016-08-17 11:05:14 UTC
+++ src/CMakeLists.txt
@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN)
 endif (WIN32 OR CYGWIN)
 
 add_definitions (-DWITH_BROKER)
+add_definitions (-DWITH_THREADING)
 
 add_executable(mosquitto ${MOSQ_SRCS})
 
@@ -86,7 +87,7 @@ if (UNIX)
 	if (APPLE)
 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
 	else (APPLE)

 	endif (APPLE)
 endif (UNIX)
 
@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON)
 endif (${WITH_TLS} STREQUAL ON)
 
 if (UNIX)

Return to bug 220827

Added Link Here

(-)b/net/mosquitto/files/patch-lib_mosquitto__internal.h (+33 lines)
1	--- lib/mosquitto_internal.h.orig 2017-07-18 16:25:21 UTC
2	+++ lib/mosquitto_internal.h
3	@@ -30,11 +30,7 @@ Contributors:
4	#endif
5	#include <stdlib.h>
6
7	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
8	-# include <pthread.h>
9	-#else
10	-# include <dummypthread.h>
11	-#endif
12	+#include <pthread.h>
13
14	#ifdef WITH_SRV
15	# include <ares.h>
16	@@ -184,7 +180,7 @@ struct mosquitto {
17	#endif
18	bool want_write;
19	bool want_connect;
20	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
21	+
22	pthread_mutex_t callback_mutex;
23	pthread_mutex_t log_callback_mutex;
24	pthread_mutex_t msgtime_mutex;
25	@@ -195,7 +191,7 @@ struct mosquitto {
26	pthread_mutex_t out_message_mutex;
27	pthread_mutex_t mid_mutex;
28	pthread_t thread_id;
29	-#endif
30	+
31	bool clean_session;
32	#ifdef WITH_BROKER
33	bool is_dropping;

Lines 1-6 Link Here

(-)b/net/mosquitto/files/patch-src_CMakeLists.txt (-3 / +11 lines)
1	--- src/CMakeLists.txt.orig 2015-05-07 13:21:22 UTC	1	--- src/CMakeLists.txt.orig 2016-08-17 11:05:14 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -86,7 +86,7 @@ if (UNIX)	3	@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN)
		4	endif (WIN32 OR CYGWIN)
		5
		6	add_definitions (-DWITH_BROKER)
		7	+add_definitions (-DWITH_THREADING)
		8
		9	add_executable(mosquitto ${MOSQ_SRCS})
		10
		11	@@ -86,7 +87,7 @@ if (UNIX)
4	if (APPLE)	12	if (APPLE)
5	set (MOSQ_LIBS ${MOSQ_LIBS} dl m)	13	set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
6	else (APPLE)	14	else (APPLE)
Lines 9-15 Link Here
9	endif (APPLE)	17	endif (APPLE)
10	endif (UNIX)	18	endif (UNIX)
11		19
12	@@ -127,6 +127,5 @@ if (${WITH_TLS} STREQUAL ON)	20	@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON)
13	endif (${WITH_TLS} STREQUAL ON)	21	endif (${WITH_TLS} STREQUAL ON)
14		22
15	if (UNIX)	23	if (UNIX)