5 files changed, 23 insertions, 14 deletions

diff --git a/src/solvers/distribution.h b/src/solvers/distribution.h
index 7adc964..78b9b5e 100644
--- a/src/solvers/distribution.h
+++ b/src/solvers/distribution.h
@@ -10,13 +10,13 @@ typedef struct {
         const unsigned char *table;
 } getdistribution_data_t;
 
-STATIC void *getdistribution_runthread(void *);
+STATIC wrapthread_return_t getdistribution_runthread(void *);
 STATIC void getdistribution(const unsigned char *,
     uint64_t [static INFO_DISTRIBUTION_LEN], const tableinfo_t [static 1]);
 STATIC bool distribution_equal(const uint64_t [static INFO_DISTRIBUTION_LEN],
     const uint64_t [static INFO_DISTRIBUTION_LEN], uint8_t);
 
-STATIC void *
+STATIC wrapthread_return_t
 getdistribution_runthread(void *arg)
 {
         getdistribution_data_t *data = (getdistribution_data_t *)arg;
@@ -33,7 +33,7 @@ getdistribution_runthread(void *arg)
                 for (j = 0; j < ENTRIES_PER_BYTE(k); j++)
                         data->distr[(table[i] & (m << (j*k))) >> (j*k)]++;
 
-        return NULL;
+        return wrapthread_return_val;
 }
 
 STATIC void
diff --git a/src/solvers/h48/distribution_h48.h b/src/solvers/h48/distribution_h48.h
index 6d50ae5..80c946e 100644
--- a/src/solvers/h48/distribution_h48.h
+++ b/src/solvers/h48/distribution_h48.h
@@ -4,11 +4,11 @@ needed for H48 because of the intertwined fallback table, and it is easier
 to have some duplication than to make these functions needlessly generic.
 */
 
-STATIC void *getdistribution_h48_runthread(void *);
+STATIC wrapthread_return_t getdistribution_h48_runthread(void *);
 STATIC void getdistribution_h48(const unsigned char *,
     uint64_t [static INFO_DISTRIBUTION_LEN], const tableinfo_t [static 1]);
 
-STATIC void *
+STATIC wrapthread_return_t 
 getdistribution_h48_runthread(void *arg)
 {
         getdistribution_data_t *data = (getdistribution_data_t *)arg;
@@ -33,7 +33,7 @@ getdistribution_h48_runthread(void *arg)
                 data->distr[(t & (m << (3*k))) >> (3*k)]--;
         }
 
-        return NULL;
+        return wrapthread_return_val;
 }
 
 STATIC void
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index a5bb331..b37bcfb 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -3,7 +3,7 @@ STATIC long long gendata_h48_dispatch(
 STATIC uint64_t gendata_h48short(gendata_h48short_arg_t [static 1]);
 STATIC int64_t gendata_h48(gendata_h48_arg_t [static 1]);
 STATIC void gendata_h48_maintable(gendata_h48_arg_t [static 1]);
-STATIC void *gendata_h48_runthread(void *);
+STATIC wrapthread_return_t gendata_h48_runthread(void *);
 
 STATIC_INLINE void gendata_h48_mark(gendata_h48_mark_t [static 1]);
 STATIC_INLINE bool gendata_h48_dfs_stop(
@@ -291,7 +291,7 @@ gendata_h48_maintable(gendata_h48_arg_t arg[static 1])
         writetableinfo(&arg->info, bufsize, (unsigned char *)arg->h48buf);
 }
 
-STATIC void *
+STATIC wrapthread_return_t 
 gendata_h48_runthread(void *arg)
 {
         uint64_t coord, coordext, coordmin;
@@ -328,7 +328,7 @@ gendata_h48_runthread(void *arg)
                 }
         }
 
-        return NULL;
+        return wrapthread_return_val;
 }
 
 STATIC void
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index 19aaf79..4fd0aea 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -78,7 +78,7 @@ STATIC_INLINE void h48_prune_restore_inverse(const h48_prune_t [static 1],
 STATIC int64_t solve_h48_maketasks(
     dfsarg_solve_h48_t [static 1], dfsarg_solve_h48_maketasks_t [static 1],
     solve_h48_task_t [static H48_STARTING_CUBES], int [static 1]);
-STATIC void *solve_h48_runthread(void *);
+STATIC wrapthread_return_t solve_h48_runthread(void *);
 STATIC int64_t solve_h48_dfs(dfsarg_solve_h48_t [static 1]);
 STATIC void solve_h48_log_solutions(solution_list_t [static 1], size_t);
 STATIC int solve_h48_compare_tasks(const void *, const void *);
@@ -383,7 +383,7 @@ solve_h48_dfs(dfsarg_solve_h48_t arg[static 1])
         return ret;
 }
 
-STATIC void *
+STATIC wrapthread_return_t 
 solve_h48_runthread(void *arg)
 {
         int i, j;
@@ -445,7 +445,7 @@ solve_h48_runthread(void *arg)
 
 solve_h48_runthread_end:
         dfsarg->thread_done = true;
-        return NULL;
+        return wrapthread_return_val;
 }
 
 STATIC int64_t
diff --git a/src/utils/wrapthread.h b/src/utils/wrapthread.h
index d5de155..fe9d175 100644
--- a/src/utils/wrapthread.h
+++ b/src/utils/wrapthread.h
@@ -2,6 +2,9 @@
 
 #define wrapthread_atomic
 
+#define wrapthread_return_t int
+#define wrapthread_return_val 0
+
 #define wrapthread_define_var_thread_t(x) unused char x
 #define wrapthread_define_var_mutex_t(x) unused char x
 #define wrapthread_define_struct_thread_t(x) char x
@@ -15,12 +18,15 @@
 #define wrapthread_mutex_lock(a)
 #define wrapthread_mutex_unlock(a)
 
-#elif defined(_WIN32)
+#elif defined(__unix__)
 
 #include <threads.h>
 
 #define wrapthread_atomic _Atomic
 
+#define wrapthread_return_t int
+#define wrapthread_return_val 0
+
 #define wrapthread_define_var_thread_t(x) thrd_t x
 #define wrapthread_define_var_mutex_t(x) mtx_t x
 #define wrapthread_define_struct_thread_t(x) thrd_t x
@@ -28,7 +34,7 @@
 
 #define wrapthread_define_if_threads(T, x) T x
 
-#define wrapthread_create(a, f, arg) thrd_create(a, (int(*)(void *))f, arg)
+#define wrapthread_create(a, f, arg) thrd_create(a, f, arg)
 #define wrapthread_join(a) thrd_join(a, NULL)
 #define wrapthread_mutex_init(a) mtx_init(a, mtx_plain)
 #define wrapthread_mutex_lock(a) mtx_lock(a)
@@ -40,6 +46,9 @@
 
 #define wrapthread_atomic _Atomic
 
+#define wrapthread_return_t void *
+#define wrapthread_return_val NULL
+
 #define wrapthread_define_var_thread_t(x) pthread_t x
 #define wrapthread_define_var_mutex_t(x) pthread_mutex_t x
 #define wrapthread_define_struct_thread_t(x) pthread_t x