* 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.
* 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 "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"
/*******************************************************************
return ret;
}
-gmx_bool gmx_fio_reade_gmx_large_int(t_fileio *fio, gmx_large_int_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;
}
return ret;
}
-gmx_bool gmx_fio_writee_gmx_large_int(t_fileio *fio, gmx_large_int_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;
}
return ret;
}
-gmx_bool gmx_fio_doe_gmx_large_int(t_fileio *fio, gmx_large_int_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;
return ret;
}
-gmx_bool gmx_fio_nreade_gmx_large_int(t_fileio *fio, gmx_large_int_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);
return ret;
}
-gmx_bool gmx_fio_nwritee_gmx_large_int(t_fileio *fio,
- const gmx_large_int_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);
-gmx_bool gmx_fio_ndoe_gmx_large_int(t_fileio *fio, gmx_large_int_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;
{
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);
}
}