Sort all includes in src/gromacs

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

diff --git a/src/gromacs/fileio/gmxfio_rw.c b/src/gromacs/fileio/gmxfio_rw.c
index bdeed1855408bb4527dba225b0c7afc88faa68c2..bdfa1ec4d80b9d3bc2e061dc2becc3f316bfac01 100644 (file)
--- a/src/gromacs/fileio/gmxfio_rw.c
+++ b/src/gromacs/fileio/gmxfio_rw.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,27 +34,24 @@
  * 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 "config.h"
 
-#include <ctype.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.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"
-
-#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"
 
 
 /*******************************************************************
@@ -104,12 +101,12 @@ gmx_bool gmx_fio_reade_int(t_fileio *fio, int *item,
     return ret;
 }
 
-gmx_bool gmx_fio_reade_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                     const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_reade_int64(t_fileio *fio, gmx_int64_t *item,
+                             const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
-    ret = fio->iotp->nread(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+    ret = fio->iotp->nread(fio, item, 1, eioINT64, desc, srcfile, line);
     gmx_fio_unlock(fio);
     return ret;
 }
@@ -209,12 +206,12 @@ gmx_bool gmx_fio_writee_int(t_fileio *fio, int item,
     return ret;
 }
 
-gmx_bool gmx_fio_writee_gmx_large_int(t_fileio *fio, gmx_int64_t item,
-                                      const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_writee_int64(t_fileio *fio, gmx_int64_t item,
+                              const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
-    ret = fio->iotp->nwrite(fio, &item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+    ret = fio->iotp->nwrite(fio, &item, 1, eioINT64, desc, srcfile, line);
     gmx_fio_unlock(fio);
     return ret;
 }
@@ -364,18 +361,18 @@ gmx_bool gmx_fio_doe_int(t_fileio *fio, int *item,
     return ret;
 }
 
-gmx_bool gmx_fio_doe_gmx_large_int(t_fileio *fio, gmx_int64_t *item,
-                                   const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_doe_int64(t_fileio *fio, gmx_int64_t *item,
+                           const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret;
     gmx_fio_lock(fio);
     if (fio->bRead)
     {
-        ret = fio->iotp->nread(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+        ret = fio->iotp->nread(fio, item, 1, eioINT64, desc, srcfile, line);
     }
     else
     {
-        ret = fio->iotp->nwrite(fio, item, 1, eioGMX_LARGE_INT, desc, srcfile, line);
+        ret = fio->iotp->nwrite(fio, item, 1, eioINT64, desc, srcfile, line);
     }
     gmx_fio_unlock(fio);
     return ret;
@@ -533,15 +530,15 @@ gmx_bool gmx_fio_nreade_int(t_fileio *fio, int *item, int n,
     return ret;
 }
 
-gmx_bool gmx_fio_nreade_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                      const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_nreade_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                              const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
     gmx_fio_lock(fio);
     for (i = 0; i < n; i++)
     {
-        ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+        ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioINT64, desc,
                                       srcfile, line);
     }
     gmx_fio_unlock(fio);
@@ -677,16 +674,16 @@ gmx_bool gmx_fio_nwritee_int(t_fileio *fio, const int *item, int n,
     return ret;
 }
 
-gmx_bool gmx_fio_nwritee_gmx_large_int(t_fileio *fio,
-                                       const gmx_int64_t *item, int n,
-                                       const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_nwritee_int64(t_fileio *fio,
+                               const gmx_int64_t *item, int n,
+                               const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
     gmx_fio_lock(fio);
     for (i = 0; i < n; i++)
     {
-        ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioGMX_LARGE_INT,
+        ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioINT64,
                                        desc, srcfile, line);
     }
     gmx_fio_unlock(fio);
@@ -890,8 +887,8 @@ gmx_bool gmx_fio_ndoe_int(t_fileio *fio, int *item, int n,
 
 
 
-gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
-                                    const char *desc, const char *srcfile, int line)
+gmx_bool gmx_fio_ndoe_int64(t_fileio *fio, gmx_int64_t *item, int n,
+                            const char *desc, const char *srcfile, int line)
 {
     gmx_bool ret = TRUE;
     int      i;
@@ -900,12 +897,12 @@ gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_int64_t *item, int n,
     {
         if (fio->bRead)
         {
-            ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+            ret = ret && fio->iotp->nread(fio, &(item[i]), 1, eioINT64, desc,
                                           srcfile, line);
         }
         else
         {
-            ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioGMX_LARGE_INT, desc,
+            ret = ret && fio->iotp->nwrite(fio, &(item[i]), 1, eioINT64, desc,
                                            srcfile, line);
         }
     }