Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxpreprocess/readir.c b/src/gromacs/gmxpreprocess/readir.c
index 521a6e3268d0faf49b30d22a78d389bc6b0d8c51..8b1b8c823829f72d1a1facb7a344f7d85ee9ddcb 100644 (file)
--- a/src/gromacs/gmxpreprocess/readir.c
+++ b/src/gromacs/gmxpreprocess/readir.c
@@ -41,12 +41,11 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "sysstuff.h"
 #include "gromacs/utility/smalloc.h"
 #include "typedefs.h"
 #include "physics.h"
 #include "names.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 #include "macros.h"
 #include "index.h"
 #include "symtab.h"
@@ -57,7 +56,7 @@
 #include "toputil.h"
 #include "index.h"
 #include "network.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "pbc.h"
 #include "mtop_util.h"
 #include "chargegroup.h"
@@ -3090,7 +3089,7 @@ static void make_swap_groups(
 
 void make_IMD_group(t_IMD *IMDgroup, char *IMDgname, t_blocka *grps, char **gnames)
 {
-    int      ig = -1, i;
+    int      ig, i;
 
 
     ig            = search_string(IMDgname, grps->nr, gnames);