* 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/fileio/gmxfio.h"
+#include "gromacs/fileio/xdrf.h"
+#include "gromacs/legacyheaders/macros.h"
#include "gromacs/math/vec.h"
-#include "xdrf.h"
-#include "macros.h"
-#include "typedefs.h"
-
#include "gromacs/pbcutil/pbc.h"
#include "gromacs/topology/topology.h"
#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
#include "gromacs/utility/smalloc.h"
/* The source code in this file should be thread-safe.
}
else
{
- nm->unit = strdup("kJ/mol");
+ nm->unit = gmx_strdup("kJ/mol");
}
}
}
int i, b;
gmx_bool bRead, bOK, bOK1, bSane;
real tmp1, tmp2, rdum;
- char buf[22];
/*int d_size;*/
bOK = TRUE;
{
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)
{