Manually sort some includes in src/gromacs

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

diff --git a/src/gromacs/fileio/gmxfio_bin.c b/src/gromacs/fileio/gmxfio_bin.c
index cf50e0fdc48c71ebc8cacf5915c71606c83bf041..498a795eb4da99a8bf5544e08da2f17a8b793ac9 100644 (file)
--- a/src/gromacs/fileio/gmxfio_bin.c
+++ b/src/gromacs/fileio/gmxfio_bin.c
@@ -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,31 +34,25 @@
  * 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 <ctype.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "config.h"
+
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
 
-#include "gmx_fatal.h"
-#include "macros.h"
-#include "smalloc.h"
-#include "futil.h"
-#include "filenm.h"
-#include "string2.h"
-#include "gmxfio.h"
-#include "md5.h"
-
-#ifdef GMX_THREAD_MPI
-#include "thread_mpi.h"
-#endif
-
-#include "gmxfio_int.h"
+#include "gromacs/fileio/filenm.h"
+#include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/gmxfio_int.h"
+#include "gromacs/fileio/md5.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 /* This is the part that reads dummy and ascii files.  */
 
@@ -93,8 +87,8 @@ static gmx_bool do_binwrite(t_fileio *fio, const void *item, int nitem, int eio,
         case eioINT:
             size = sizeof(int);
             break;
-        case eioGMX_LARGE_INT:
-            size = sizeof(gmx_large_int_t);
+        case eioINT64:
+            size = sizeof(gmx_int64_t);
             break;
         case eioUCHAR:
             size = sizeof(unsigned char);
@@ -163,8 +157,8 @@ static gmx_bool do_binread(t_fileio *fio, void *item, int nitem, int eio,
         case eioINT:
             size = sizeof(int);
             break;
-        case eioGMX_LARGE_INT:
-            size = sizeof(gmx_large_int_t);
+        case eioINT64:
+            size = sizeof(gmx_int64_t);
             break;
         case eioUCHAR:
             size = sizeof(unsigned char);