diff options
author | Thomas White <taw@physics.org> | 2020-07-30 10:16:37 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2020-07-30 10:17:12 +0200 |
commit | e14e413957b0c1e357167f43f129a6ef39ef5051 (patch) | |
tree | c26d0a6235091010138a9313bf2cfb8924903610 /src/scaling.c | |
parent | f9a6d5ea442e074d1e61585b572837f80e2ddac9 (diff) |
Eliminate duplicate symbols
This makes searching easier, and also permits Meson's unity build mode.
Diffstat (limited to 'src/scaling.c')
-rw-r--r-- | src/scaling.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scaling.c b/src/scaling.c index 368c3ab5..864bab6f 100644 --- a/src/scaling.c +++ b/src/scaling.c @@ -57,7 +57,7 @@ struct scale_args }; -struct queue_args +struct scale_queue_args { int n_started; int n_done; @@ -77,7 +77,7 @@ static void scale_crystal(void *task, int id) static void *get_crystal(void *vqargs) { struct scale_args *task; - struct queue_args *qargs = vqargs; + struct scale_queue_args *qargs = vqargs; task = malloc(sizeof(struct scale_args)); memcpy(task, &qargs->task_defaults, sizeof(struct scale_args)); @@ -92,7 +92,7 @@ static void *get_crystal(void *vqargs) static void done_crystal(void *vqargs, void *task) { - struct queue_args *qa = vqargs; + struct scale_queue_args *qa = vqargs; qa->n_done++; progress_bar(qa->n_done, qa->n_crystals, "Scaling"); free(task); @@ -124,7 +124,7 @@ static double total_log_r(Crystal **crystals, int n_crystals, RefList *full, void scale_all(Crystal **crystals, int n_crystals, int nthreads, int scaleflags) { struct scale_args task_defaults; - struct queue_args qargs; + struct scale_queue_args qargs; double old_res, new_res; int niter = 0; |