Move types/topology.h to topology/

[alexxy/gromacs.git] / src / gromacs / gmxana / nsfactor.h

diff --git a/src/gromacs/gmxana/nsfactor.h b/src/gromacs/gmxana/nsfactor.h
index 367aaa1836ac59a99f18723c46ddbeeb8a65f445..ebe6b808745dafe5cfc91273b72fea6382baaa32 100644 (file)
--- a/src/gromacs/gmxana/nsfactor.h
+++ b/src/gromacs/gmxana/nsfactor.h
@@ -39,12 +39,13 @@
 #include "gromacs/legacyheaders/index.h"
 #include "gromacs/legacyheaders/oenv.h"
 #include "gromacs/legacyheaders/types/simple.h"
-#include "gromacs/legacyheaders/types/topology.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct t_topology;
+
 typedef struct gmx_neutron_atomic_structurefactors_t {
     int       nratoms;
     int      *p;       /* proton number */
@@ -54,8 +55,8 @@ typedef struct gmx_neutron_atomic_structurefactors_t {
 } gmx_neutron_atomic_structurefactors_t;
 
 typedef struct gmx_sans_t {
-    t_topology *top;     /* topology */
-    double     *slength; /* scattering length for this topology */
+    struct t_topology *top;     /* topology */
+    double            *slength; /* scattering length for this topology */
 } gmx_sans_t;
 
 typedef struct gmx_radial_distribution_histogram_t {
@@ -80,7 +81,7 @@ void normalize_probability(int n, double *a);
 
 gmx_neutron_atomic_structurefactors_t *gmx_neutronstructurefactors_init(const char *datfn);
 
-gmx_sans_t *gmx_sans_init(t_topology *top, gmx_neutron_atomic_structurefactors_t *gnsf);
+gmx_sans_t *gmx_sans_init(struct t_topology *top, gmx_neutron_atomic_structurefactors_t *gnsf);
 
 gmx_radial_distribution_histogram_t *calc_radial_distribution_histogram  (gmx_sans_t  *gsans,
                                                                           rvec        *x,