Sort all includes in src/gromacs

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

diff --git a/src/gromacs/fileio/enxio.h b/src/gromacs/fileio/enxio.h
index 6a7b27505db4282aa1c1bf3a7dbc8a1cb166a6d4..c8434ab2b53135cb6b2c2639b5b4f75f9f14509e 100644 (file)
--- a/src/gromacs/fileio/enxio.h
+++ b/src/gromacs/fileio/enxio.h
@@ -2,8 +2,8 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2004, The GROMACS development team,
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2001-2004, The GROMACS development team.
+ * 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.
@@ -34,19 +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.
  */
-
 #ifndef GMX_FILEIO_ENXIO_H
 #define GMX_FILEIO_ENXIO_H
 
-#include "../legacyheaders/sysstuff.h"
-#include "../legacyheaders/typedefs.h"
-#include "../legacyheaders/pbc.h"
-#include "gmxfio.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/xdr_datatype.h"
+#include "gromacs/legacyheaders/types/energy.h"
+#include "gromacs/legacyheaders/types/inputrec.h"
+#include "gromacs/legacyheaders/types/state.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gmx_groups_t;
+
 /**************************************************************
  * These are the base datatypes + functions for reading and
  * writing energy files (.edr). They are either called directly
@@ -103,7 +105,7 @@ typedef struct
     float*             fval;
     double*            dval;
     int*               ival;
-    gmx_large_int_t*   lval;
+    gmx_int64_t*       lval;
     unsigned char*     cval;
     char**             sval;
 
@@ -131,8 +133,8 @@ typedef struct t_enxblock{
 /* The frames that are read/written */
 typedef struct {
     double          t;            /* Timestamp of this frame                        */
-    gmx_large_int_t step;         /* MD step                                */
-    gmx_large_int_t nsteps;       /* The number of steps between frames            */
+    gmx_int64_t     step;         /* MD step                                */
+    gmx_int64_t     nsteps;       /* The number of steps between frames            */
     double          dt;           /* The MD time step                              */
     int             nsum;         /* The number of terms for the sums in ener      */
     int             nre;          /* Number of energies                             */
@@ -186,7 +188,7 @@ gmx_bool do_enx(ener_file_t ef, t_enxframe *fr);
 /* Reads enx_frames, memory in fr is (re)allocated if necessary */
 
 void get_enx_state(const char *fn, real t,
-                   gmx_groups_t *groups, t_inputrec *ir,
+                   struct gmx_groups_t *groups, t_inputrec *ir,
                    t_state *state);
 /*
  * Reads state variables from enx file fn at time t.
@@ -216,4 +218,4 @@ void add_subblocks_enxblock(t_enxblock *eb, int n);
 }
 #endif
 
-#endif  /* GMX_FILEIO_ENERIO_H */
+#endif