aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-09-11 15:01:46 +0200
committerThomas White <taw@physics.org>2018-09-11 15:02:42 +0200
commit40c30a5326e6d8e7b2ff3bc5d7be74e01c02d3a4 (patch)
treec5a621f512adea72b2cf55e16ebcde132a3131a4
parentb8d8023ecec118354268a77fb196e0b524d4492c (diff)
Fix header dependencies between reflist.h and crystal.h
-rw-r--r--libcrystfel/src/crystal.h3
-rw-r--r--libcrystfel/src/reflist.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/libcrystfel/src/crystal.h b/libcrystfel/src/crystal.h
index f4c7477b..cc5754ca 100644
--- a/libcrystfel/src/crystal.h
+++ b/libcrystfel/src/crystal.h
@@ -36,7 +36,6 @@
#include "cell.h"
-#include "reflist.h"
/**
@@ -47,6 +46,8 @@
**/
typedef struct _crystal Crystal;
+#include "reflist.h"
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/libcrystfel/src/reflist.h b/libcrystfel/src/reflist.h
index f2fadb8b..30bbaa28 100644
--- a/libcrystfel/src/reflist.h
+++ b/libcrystfel/src/reflist.h
@@ -70,12 +70,12 @@ typedef struct _reflection Reflection;
**/
typedef struct _reflistiterator RefListIterator;
+#include "crystal.h"
+
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct _crystal Crystal;
-
/* Structure representing the contributions to a merged reflection */
struct reflection_contributions
{