diff options
| author | Thomas White <taw@physics.org> | 2018-05-17 15:31:45 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-05-17 15:39:22 +0200 |
| commit | a9f48b6507b0326a34b84d7600f5eb791993eeb1 (patch) | |
| tree | b89b6e73477125336c35c6d7d9996bd8ebae7fd7 /libcrystfel/src | |
| parent | 87fd650abf11da75e7abd2ff90821cf7cb041b91 (diff) | |
| parent | a9f4c0ff4376267d90d6e8f9a0b6c012ec0588a4 (diff) | |
Merge branch 'tom/cmake'
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/integration.c | 8 | ||||
| -rw-r--r-- | libcrystfel/src/reflist-utils.c | 6 | ||||
| -rw-r--r-- | libcrystfel/src/stream.c | 1 | ||||
| -rw-r--r-- | libcrystfel/src/thread-pool.c | 9 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c index fcbdf658..880ae87e 100644 --- a/libcrystfel/src/integration.c +++ b/libcrystfel/src/integration.c @@ -39,7 +39,7 @@ #include <gsl/gsl_linalg.h> #include <gsl/gsl_eigen.h> -#ifdef HAVE_CURSES_COLOR +#ifdef HAVE_CURSES #include <ncurses.h> #endif @@ -177,7 +177,7 @@ static float boxi(struct intcontext *ic, struct peak_box *bx, int p, int q) } -#ifdef HAVE_CURSES_COLOR +#ifdef HAVE_CURSES static void colour_on(enum boxmask_val b) { switch ( b ) { @@ -225,7 +225,7 @@ static void colour_off(enum boxmask_val b) #endif -#ifdef HAVE_CURSES_COLOR +#ifdef HAVE_CURSES static void show_reference_profile(struct intcontext *ic, int i) { int q; @@ -254,7 +254,7 @@ static void show_reference_profile(struct intcontext *ic, int i) static void show_peak_box(struct intcontext *ic, struct peak_box *bx, pthread_mutex_t *term_lock) { -#ifdef HAVE_CURSES_COLOR +#ifdef HAVE_CURSES int q; signed int h, k, l; double fs, ss; diff --git a/libcrystfel/src/reflist-utils.c b/libcrystfel/src/reflist-utils.c index 7ff78f52..54c467b3 100644 --- a/libcrystfel/src/reflist-utils.c +++ b/libcrystfel/src/reflist-utils.c @@ -27,18 +27,20 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <math.h> #include <stdio.h> #include <assert.h> - #include "reflist.h" #include "cell.h" #include "cell-utils.h" #include "utils.h" #include "reflist-utils.h" #include "symmetry.h" -#include "version.h" /** diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 47661946..9d97ff98 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -44,7 +44,6 @@ #include <sys/stat.h> #include <fcntl.h> -#include "version.h" #include "cell.h" #include "cell-utils.h" #include "utils.h" diff --git a/libcrystfel/src/thread-pool.c b/libcrystfel/src/thread-pool.c index 6824947c..7ce55d85 100644 --- a/libcrystfel/src/thread-pool.c +++ b/libcrystfel/src/thread-pool.c @@ -30,6 +30,10 @@ #include <config.h> #endif +#ifdef HAVE_CPU_AFFINITY +#define _GNU_SOURCE +#include <sched.h> +#endif #include <stdarg.h> #include <stdlib.h> @@ -39,11 +43,6 @@ #include <pthread.h> #include <assert.h> -#ifdef HAVE_CPU_AFFINITY -#include <sched.h> -#endif - - #include "utils.h" |