Remove gmx custom fixed int (e.g. gmx_int64_t) types

[alexxy/gromacs.git] / src / gromacs / fileio / g96io.cpp

diff --git a/src/gromacs/fileio/g96io.cpp b/src/gromacs/fileio/g96io.cpp
index 208c42d9cc388d0344286c1c75005561262f5d0d..9773d3ef2103ada108d960b30ef2ca1e045bfd90 100644 (file)
--- a/src/gromacs/fileio/g96io.cpp
+++ b/src/gromacs/fileio/g96io.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -284,7 +284,7 @@ int read_g96_conf(FILE *fp, const char *infile, char **name, t_trxframe *fr,
                     bFinished = (fgets2(line, STRLEN, fp) == nullptr);
                 }
                 while (!bFinished && (line[0] == '#'));
-                sscanf(line, "%15" GMX_SCNd64 "%15lf", &(fr->step), &db1);
+                sscanf(line, "%15" SCNd64 "%15lf", &(fr->step), &db1);
                 fr->time = db1;
             }
             else
@@ -371,7 +371,7 @@ void write_g96_conf(FILE *out, const char *title, const t_trxframe *fr,
     if (fr->bStep || fr->bTime)
     {
         /* Officially the time format is %15.9, which is not enough for 10 ns */
-        fprintf(out, "TIMESTEP\n%15" GMX_PRId64 "%15.6f\nEND\n", fr->step, fr->time);
+        fprintf(out, "TIMESTEP\n%15" PRId64 "%15.6f\nEND\n", fr->step, fr->time);
     }
     if (fr->bX)
     {