Merge release-5-0 into master

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

diff --git a/src/gromacs/fileio/mdoutf.h b/src/gromacs/fileio/mdoutf.h
index a063c1fd8f0d5a4c87a901d97e89876d58b753f4..7c9f2a3309188c12cbf4f7fd1b7f725b25c6355a 100644 (file)
--- a/src/gromacs/fileio/mdoutf.h
+++ b/src/gromacs/fileio/mdoutf.h
@@ -37,14 +37,23 @@
 #define GMX_FILEIO_MDOUTF_H
 
 #include <stdio.h>
-#include "../legacyheaders/types/simple.h"
-#include "../legacyheaders/types/topology.h"
+
 #include "../legacyheaders/types/inputrec.h"
 #include "../legacyheaders/types/oenv.h"
 #include "../legacyheaders/network.h"
+
+#include "../math/vectypes.h"
+#include "../timing/wallcycle.h"
+#include "../utility/basedefinitions.h"
 #include "filenm.h"
 #include "enxio.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct gmx_mtop_t;
+
 typedef struct gmx_mdoutf *gmx_mdoutf_t;
 
 /*! \brief Allocate and initialize object to manager trajectory writing output
@@ -58,7 +67,7 @@ gmx_mdoutf_t init_mdoutf(FILE              *fplog,
                          int                mdrun_flags,
                          const t_commrec   *cr,
                          const t_inputrec  *ir,
-                         gmx_mtop_t        *mtop,
+                         struct gmx_mtop_t *mtop,
                          const output_env_t oenv,
                          gmx_wallcycle_t    wcycle);
 
@@ -93,7 +102,7 @@ void done_mdoutf(gmx_mdoutf_t of);
 void mdoutf_write_to_trajectory_files(FILE *fplog, t_commrec *cr,
                                       gmx_mdoutf_t of,
                                       int mdof_flags,
-                                      gmx_mtop_t *top_global,
+                                      struct gmx_mtop_t *top_global,
                                       gmx_int64_t step, double t,
                                       t_state *state_local, t_state *state_global,
                                       rvec *f_local, rvec *f_global);
@@ -105,5 +114,8 @@ void mdoutf_write_to_trajectory_files(FILE *fplog, t_commrec *cr,
 #define MDOF_CPT          (1<<4)
 #define MDOF_IMD          (1<<5)
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* GMX_FILEIO_MDOUTF_H */