Merge pull request #1687 from tqfx/patch-1

Fix clang compilation failure on Android

src/iperf_pthread.c

@@ -6,35 +6,36 @@
  * as Android NDK does not support `pthread_cancel()`.
  */
 
+#include <string.h>
 #include <signal.h>
 #include "iperf_pthread.h"
 
-int pthread_setcanceltype(int type, int *oldtype) { return 0; }
-int pthread_setcancelstate(int state, int *oldstate) { return 0; }
-int pthread_cancel(pthread_t thread_id) {
-    int status;
-    if ((status = iperf_set_thread_exit_handler()) == 0) {
-        status = pthread_kill(thread_id, SIGUSR1);
-    }
-    return status;
-}
-
 void iperf_thread_exit_handler(int sig)
-{ 
+{
     pthread_exit(0);
 }
 
 int iperf_set_thread_exit_handler() {
     int rc;
     struct sigaction actions;
 
-    memset(&actions, 0, sizeof(actions)); 
+    memset(&actions, 0, sizeof(actions));
     sigemptyset(&actions.sa_mask);
-    actions.sa_flags = 0; 
+    actions.sa_flags = 0;
     actions.sa_handler = iperf_thread_exit_handler;
 
     rc = sigaction(SIGUSR1, &actions, NULL);
     return rc;
 }
 
+int pthread_setcanceltype(int type, int *oldtype) { return 0; }
+int pthread_setcancelstate(int state, int *oldstate) { return 0; }
+int pthread_cancel(pthread_t thread_id) {
+    int status;
+    if ((status = iperf_set_thread_exit_handler()) == 0) {
+        status = pthread_kill(thread_id, SIGUSR1);
+    }
+    return status;
+}
+
 #endif // defined(HAVE_PTHREAD) && defined(__ANDROID__)

src/iperf_pthread.h

@@ -10,12 +10,12 @@
  */
 
 #define PTHREAD_CANCEL_ASYNCHRONOUS 0
-#define PTHREAD_CANCEL_ENABLE NULL
+#define PTHREAD_CANCEL_ENABLE 0
 
 int pthread_setcanceltype(int type, int *oldtype);
 int pthread_setcancelstate(int state, int *oldstate);
 int pthread_cancel(pthread_t thread_id);
 
 #endif // defined(__ANDROID__)
 
-#endif // defined(HAVE_PTHREAD)
+#endif // defined(HAVE_PTHREAD)