Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / timing / walltime_accounting.c

diff --git a/src/gromacs/timing/walltime_accounting.c b/src/gromacs/timing/walltime_accounting.c
index f7ccc4f18decc177e0d756e32d25a6b0d44907dc..25c723d4d6a20a1aa902f3891bc3a6be99ec3c71 100644 (file)
--- a/src/gromacs/timing/walltime_accounting.c
+++ b/src/gromacs/timing/walltime_accounting.c
@@ -2,7 +2,7 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 2013, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, 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.
@@ -33,16 +33,14 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#include "gromacs/timing/walltime_accounting.h"
+#include "gmxpre.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "walltime_accounting.h"
 
-#include "gromacs/legacyheaders/smalloc.h"
-#include "gromacs/legacyheaders/types/simple.h"
+#include "config.h"
 
 #include <time.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -50,6 +48,9 @@
 #include <sys/time.h>
 #endif
 
+#include "gromacs/utility/basedefinitions.h"
+#include "gromacs/utility/smalloc.h"
+
 /* TODO in future: convert gmx_walltime_accounting to a class,
  * resolve who should have responsibility for recording the number of
  * steps done, consider whether parts of finish_time, print_perf,
@@ -82,7 +83,7 @@ typedef struct gmx_walltime_accounting {
      * with respect to parallelism implementation. */
     int             numOpenMPThreads;
     //! Set by integrators to report the amount of work they did
-    gmx_large_int_t nsteps_done;
+    gmx_int64_t     nsteps_done;
 } t_gmx_walltime_accounting;
 
 /*! \brief Calls system timing routines (e.g. clock_gettime) to get
@@ -184,7 +185,7 @@ walltime_accounting_get_nsteps_done(gmx_walltime_accounting_t walltime_accountin
 
 void
 walltime_accounting_set_nsteps_done(gmx_walltime_accounting_t   walltime_accounting,
-                                    gmx_large_int_t             nsteps_done)
+                                    gmx_int64_t                 nsteps_done)
 {
     walltime_accounting->nsteps_done = nsteps_done;
 }