From ea8e7bc35e5c09096c04f5c269451a330d59c49b Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 13 Mar 2018 10:01:13 +0100
Subject: Nicer way of getting Git revision

This will need a separate way to create the official releases
(which shouldn't have Git revisions attached)
---
 libcrystfel/src/reflist-utils.c | 6 ++++--
 libcrystfel/src/stream.c        | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'libcrystfel/src')

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 d7d997cf..0f4dcd6b 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"
-- 
cgit v1.2.3


From 12e5aaa14841a7b6b8b80a1e32a2512354801f10 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 21 Mar 2018 11:37:28 +0100
Subject: Improve/fix tests for clock_gettime and sched_setaffinity

---
 libcrystfel/src/thread-pool.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'libcrystfel/src')

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"
 
 
-- 
cgit v1.2.3


From fba58042c236d8ceec09c7310583797401eda0ab Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 22 Mar 2018 11:26:35 +0100
Subject: Test for Curses

---
 libcrystfel/src/integration.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libcrystfel/src')

diff --git a/libcrystfel/src/integration.c b/libcrystfel/src/integration.c
index c18ae110..d7a34954 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;
-- 
cgit v1.2.3