Disable threading on Android

It doesn't support pthread_cancel. Closes #1308. Thanks to Daniel d'Andrada.
eclipse · Jun 18, 2019 · 3d8ecc3 · 3d8ecc3
1 parent e642bee
commit 3d8ecc3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -35,6 +35,8 @@ Broker:
 Client library:
 - Fix typo causing build error on Windows when building without TLS support.
  Closes #1264.
+- Disable `WITH_THREADING` on Android, because it doesn't have `pthread_cancel`.
+ Closes #1308.
 
 Clients:
 - Fix -L url parsing when `/topic` part is missing.

diff --git a/config.h b/config.h
@@ -16,6 +16,11 @@
 # define _POSIX_C_SOURCE 200809L
 #endif
 
+/* Android Bionic libpthread implementation doesn't have pthread_cancel. */
+#ifdef ANDROID
+# undef WITH_THREADING
+#endif
+
 #define _GNU_SOURCE
 
 #define OPENSSL_LOAD_CONF

diff --git a/www/posts/2019/06/version-1-6-3-released.md b/www/posts/2019/06/version-1-6-3-released.md
@@ -44,6 +44,8 @@ This is a bugfix release.
 ## Client library
 - Fix typo causing build error on Windows when building without TLS support.
  Closes [#1264].
+- Disable `WITH_THREADING` on Android, because it doesn't have `pthread_cancel`.
+ Closes [#1308].
 
 ## Clients
 - Fix -L url parsing when `/topic` part is missing.
@@ -82,3 +84,4 @@ This is a bugfix release.
 [#1290]: https://github.com/eclipse/mosquitto/issues/1290
 [#1294]: https://github.com/eclipse/mosquitto/issues/1294
 [#1302]: https://github.com/eclipse/mosquitto/issues/1302
+[#1308]: https://github.com/eclipse/mosquitto/pull/1308