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 | |
| parent | f9a6d5ea442e074d1e61585b572837f80e2ddac9 (diff) | |
Eliminate duplicate symbols
This makes searching easier, and also permits Meson's unity build mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/post-refinement.c | 8 | ||||
| -rw-r--r-- | src/scaling.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/post-refinement.c b/src/post-refinement.c index b3ce79c1..09438a82 100644 --- a/src/post-refinement.c +++ b/src/post-refinement.c @@ -753,7 +753,7 @@ struct refine_args }; -struct queue_args +struct pr_queue_args { int n_started; int n_done; @@ -780,7 +780,7 @@ static void refine_image(void *task, int id) static void *get_image(void *vqargs) { struct refine_args *task; - struct queue_args *qargs = vqargs; + struct pr_queue_args *qargs = vqargs; task = malloc(sizeof(struct refine_args)); memcpy(task, &qargs->task_defaults, sizeof(struct refine_args)); @@ -796,7 +796,7 @@ static void *get_image(void *vqargs) static void done_image(void *vqargs, void *task) { - struct queue_args *qa = vqargs; + struct pr_queue_args *qa = vqargs; qa->n_done++; @@ -811,7 +811,7 @@ void refine_all(Crystal **crystals, int n_crystals, SymOpList *sym, SymOpList *amb, int scaleflags) { struct refine_args task_defaults; - struct queue_args qargs; + struct pr_queue_args qargs; task_defaults.full = full; task_defaults.crystal = NULL; 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; |