Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_eneconv.c

diff --git a/src/gromacs/gmxana/gmx_eneconv.c b/src/gromacs/gmxana/gmx_eneconv.c
index a521f90facd3c3133256b0e862b7587bbb7dc0fd..b4a542197b26e3239d84cd2ce93259232c2fb5f6 100644 (file)
--- a/src/gromacs/gmxana/gmx_eneconv.c
+++ b/src/gromacs/gmxana/gmx_eneconv.c
@@ -37,8 +37,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <string.h>
+
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "typedefs.h"
 #include "gromacs/utility/smalloc.h"
@@ -46,9 +48,9 @@
 #include "disre.h"
 #include "names.h"
 #include "macros.h"
-#include "gmx_fatal.h"
+#include "gromacs/utility/fatalerror.h"
 #include "gromacs/fileio/enxio.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
 #include "gmx_ana.h"
 #include "gromacs/fileio/trxio.h"
 
@@ -581,7 +583,6 @@ int gmx_eneconv(int argc, char *argv[])
     nset     = 0;
     timestep = 0.0;
     snew(fnms, argc);
-    nfile        = 0;
     lastfilestep = 0;
     laststep     = startstep = 0;