Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / xlate.c

diff --git a/src/gromacs/gmxpreprocess/xlate.c b/src/gromacs/gmxpreprocess/xlate.c
index 4391a33b7a78e20f7cb30a605869956c6a58526c..172e231e50ddecc6303d9660c4d0dcc0f3dd73b2 100644 (file)
--- a/src/gromacs/gmxpreprocess/xlate.c
+++ b/src/gromacs/gmxpreprocess/xlate.c
@@ -40,18 +40,19 @@
 
 #include <ctype.h>
 #include <string.h>
+
 #include "typedefs.h"
-#include "gromacs/utility/cstringutil.h"
-#include "gromacs/utility/smalloc.h"
-#include "symtab.h"
-#include "index.h"
-#include "gromacs/fileio/futil.h"
 #include "fflibutil.h"
 #include "hackblock.h"
-#include "gmx_fatal.h"
 #include "xlate.h"
 
 #include "gromacs/fileio/strdb.h"
+#include "gromacs/topology/residuetypes.h"
+#include "gromacs/topology/symtab.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 typedef struct {
     char *filebase;
@@ -137,7 +138,7 @@ static void done_xlatom(int nxlate, t_xlate_atom *xlatom)
 
 void rename_atoms(const char *xlfile, const char *ffdir,
                   t_atoms *atoms, t_symtab *symtab, const t_restp *restp,
-                  gmx_bool bResname, gmx_residuetype_t rt, gmx_bool bReorderNum,
+                  gmx_bool bResname, gmx_residuetype_t *rt, gmx_bool bReorderNum,
                   gmx_bool bVerbose)
 {
     FILE         *fp;