C11 threads!

3 files changed, 9 insertions, 9 deletions

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