Fix dependencies on config.h for typedefs.h

[alexxy/gromacs.git] / src / gromacs / legacyheaders / types / nbnxn_pairlist.h

diff --git a/src/gromacs/legacyheaders/types/nbnxn_pairlist.h b/src/gromacs/legacyheaders/types/nbnxn_pairlist.h
index 0748804c37ab05671a51f55ae024933af087bf89..dec56d38f17f0c5dfe6f5bbe416f2dfc4d61a493 100644 (file)
--- a/src/gromacs/legacyheaders/types/nbnxn_pairlist.h
+++ b/src/gromacs/legacyheaders/types/nbnxn_pairlist.h
@@ -36,13 +36,8 @@
 #ifndef _nbnxn_pairlist_h
 #define _nbnxn_pairlist_h
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include "nblist.h"
 
-#include "../thread_mpi/atomic.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -80,10 +75,8 @@ typedef void nbnxn_free_t (void *ptr);
 typedef struct {
     int          cj;    /* The j-cluster                    */
     unsigned int excl;  /* The exclusion (interaction) bits */
-#ifdef GMX_SIMD_IBM_QPX
     /* Indices into the arrays of SIMD interaction masks. */
     char         interaction_mask_indices[4];
-#endif
 } nbnxn_cj_t;
 
 /* In nbnxn_ci_t the integer shift contains the shift in the lower 7 bits.
@@ -229,6 +222,9 @@ enum {
     ljcrGEOM, ljcrLB, ljcrNONE, ljcrNR
 };
 
+/* TODO: Remove need for forward declare */
+struct tMPI_Atomic;
+
 typedef struct {
     nbnxn_alloc_t           *alloc;
     nbnxn_free_t            *free;
@@ -266,16 +262,14 @@ typedef struct {
      */
     unsigned int            *simd_exclusion_filter1;
     unsigned int            *simd_exclusion_filter2;
-#ifdef GMX_SIMD_IBM_QPX
     real                    *simd_interaction_array; /* Array of masks needed for exclusions on QPX */
-#endif
     int                      nout;                   /* The number of force arrays                         */
     nbnxn_atomdata_output_t *out;                    /* Output data structures               */
     int                      nalloc;                 /* Allocation size of all arrays (for x/f *x/fstride) */
     gmx_bool                 bUseBufferFlags;        /* Use the flags or operate on all atoms     */
     nbnxn_buffer_flags_t     buffer_flags;           /* Flags for buffer zeroing+reduc.  */
     gmx_bool                 bUseTreeReduce;         /* Use tree for force reduction */
-    tMPI_Atomic_t           *syncStep;               /* Synchronization step for tree reduce */
+    struct tMPI_Atomic      *syncStep;               /* Synchronization step for tree reduce */
 } nbnxn_atomdata_t;
 
 #ifdef __cplusplus