Move types/topology.h to topology/

[alexxy/gromacs.git] / src / gromacs / fileio / tpxio.h

diff --git a/src/gromacs/fileio/tpxio.h b/src/gromacs/fileio/tpxio.h
index 8279544c1f7433b54ef95248783eb22184e2d254..3611be60d249fbc8c58fd80ac40b76f233bd6ec2 100644 (file)
--- a/src/gromacs/fileio/tpxio.h
+++ b/src/gromacs/fileio/tpxio.h
@@ -49,15 +49,16 @@
  **************************************************************/
 #include "../legacyheaders/types/inputrec.h"
 #include "../legacyheaders/types/state.h"
-#include "../legacyheaders/types/topology.h"
 #include "gmxfio.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gmx_mtop_t;
 struct t_atoms;
 struct t_block;
+struct t_topology;
 
 typedef struct
 {
@@ -112,7 +113,7 @@ void read_tpxheader(const char *fn, t_tpxheader *tpx, gmx_bool TopOnlyOK,
  */
 
 void write_tpx_state(const char *fn,
-                     t_inputrec *ir, t_state *state, gmx_mtop_t *mtop);
+                     t_inputrec *ir, t_state *state, struct gmx_mtop_t *mtop);
 /* Write a file, and close it again.
  * If fn == NULL, an efTPA file will be written to stdout (which
  * will not be closed afterwards)
@@ -120,10 +121,10 @@ void write_tpx_state(const char *fn,
 
 void read_tpx_state(const char *fn,
                     t_inputrec *ir, t_state *state, rvec *f,
-                    gmx_mtop_t *mtop);
+                    struct gmx_mtop_t *mtop);
 int read_tpx(const char *fn,
              t_inputrec *ir, matrix box, int *natoms,
-             rvec *x, rvec *v, rvec *f, gmx_mtop_t *mtop);
+             rvec *x, rvec *v, rvec *f, struct gmx_mtop_t *mtop);
 /* Read a file, and close it again.
  * If fn == NULL, an efTPA file will be read from stdin (which
  * will not be closed afterwards)
@@ -133,13 +134,13 @@ int read_tpx(const char *fn,
 
 int read_tpx_top(const char *fn,
                  t_inputrec *ir, matrix box, int *natoms,
-                 rvec *x, rvec *v, rvec *f, t_topology *top);
+                 rvec *x, rvec *v, rvec *f, struct t_topology *top);
 /* As read_tpx, but for the old t_topology struct */
 
 gmx_bool fn2bTPX(const char *file);
 /* return if *file is one of the TPX file types */
 
-gmx_bool read_tps_conf(const char *infile, char *title, t_topology *top,
+gmx_bool read_tps_conf(const char *infile, char *title, struct t_topology *top,
                        int *ePBC, rvec **x, rvec **v, matrix box, gmx_bool bMass);
 /* Read title, top.atoms, x, v (if not NULL) and box from an STX file,
  * memory for atoms, x and v will be allocated.