Remove unnecessary config.h includes

[alexxy/gromacs.git] / src / gromacs / fileio / enxio.c

diff --git a/src/gromacs/fileio/enxio.c b/src/gromacs/fileio/enxio.c
index 57ae92fbf8e7be7299e98ba01266c8969dbc9d1f..d6dce5f4ab98e589d84a9c33cf08f3a2d5f0cf36 100644 (file)
--- a/src/gromacs/fileio/enxio.c
+++ b/src/gromacs/fileio/enxio.c
@@ -34,21 +34,21 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "enxio.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "gromacs/utility/futil.h"
-#include "gmxfio.h"
-#include "enxio.h"
-#include "gromacs/math/vec.h"
-#include "xdrf.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
 
-#include "pbc.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/xdrf.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/pbc.h"
+#include "gromacs/topology/topology.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
@@ -375,7 +375,7 @@ static void edr_strings(XDR *xdr, gmx_bool bRead, int file_version,
         }
         else
         {
-            nm->unit = strdup("kJ/mol");
+            nm->unit = gmx_strdup("kJ/mol");
         }
     }
 }
@@ -923,7 +923,6 @@ gmx_bool do_enx(ener_file_t ef, t_enxframe *fr)
     int           i, b;
     gmx_bool      bRead, bOK, bOK1, bSane;
     real          tmp1, tmp2, rdum;
-    char          buf[22];
     /*int       d_size;*/
 
     bOK   = TRUE;
@@ -976,9 +975,9 @@ gmx_bool do_enx(ener_file_t ef, t_enxframe *fr)
     {
         fprintf(stderr, "\nWARNING: there may be something wrong with energy file %s\n",
                 gmx_fio_getname(ef->fio));
-        fprintf(stderr, "Found: step=%s, nre=%d, nblock=%d, time=%g.\n"
+        fprintf(stderr, "Found: step=%"GMX_PRId64 ", nre=%d, nblock=%d, time=%g.\n"
                 "Trying to skip frame expect a crash though\n",
-                gmx_step_str(fr->step, buf), fr->nre, fr->nblock, fr->t);
+                fr->step, fr->nre, fr->nblock, fr->t);
     }
     if (bRead && fr->nre > fr->e_alloc)
     {