Clean up gmxfio includes

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

diff --git a/src/gromacs/fileio/xtcio.h b/src/gromacs/fileio/xtcio.h
index 2c50fb89f0bc5300b79069b29f7e84593636ea39..1d173f8ea5708d1f1afbebb2c908b526012c2eab 100644 (file)
--- a/src/gromacs/fileio/xtcio.h
+++ b/src/gromacs/fileio/xtcio.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015, 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.
@@ -38,7 +38,6 @@
 #ifndef GMX_FILEIO_XTCIO_H
 #define GMX_FILEIO_XTCIO_H
 
-#include "gromacs/fileio/gmxfio.h"
 #include "gromacs/math/vectypes.h"
 #include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"
@@ -47,37 +46,33 @@
 extern "C" {
 #endif
 
+struct t_fileio;
+
 /* All functions return 1 if successful, 0 otherwise
  * bOK tells if a frame is not corrupted
  */
 
-t_fileio *open_xtc(const char *filename, const char *mode);
+struct t_fileio *open_xtc(const char *filename, const char *mode);
 /* Open a file for xdr I/O */
 
-void close_xtc(t_fileio *fio);
+void close_xtc(struct t_fileio *fio);
 /* Close the file for xdr I/O */
 
-int read_first_xtc(t_fileio *fio,
+int read_first_xtc(struct t_fileio *fio,
                    int *natoms, int *step, real *time,
                    matrix box, rvec **x, real *prec, gmx_bool *bOK);
 /* Open xtc file, read xtc file first time, allocate memory for x */
 
-int read_next_xtc(t_fileio *fio,
+int read_next_xtc(struct t_fileio *fio,
                   int natoms, int *step, real *time,
                   matrix box, rvec *x, real *prec, gmx_bool *bOK);
 /* Read subsequent frames */
 
-int write_xtc(t_fileio *fio,
+int write_xtc(struct t_fileio *fio,
               int natoms, int step, real time,
               matrix box, rvec *x, real prec);
 /* Write a frame to xtc file */
 
-int xtc_check(const char *str, gmx_bool bResult, const char *file, int line);
-#define XTC_CHECK(s, b) xtc_check(s, b, __FILE__, __LINE__)
-
-void xtc_check_fat_err(const char *str, gmx_bool bResult, const char *file, int line);
-#define XTC_CHECK_FAT_ERR(s, b) xtc_check_fat_err(s, b, __FILE__, __LINE__)
-
 #ifdef __cplusplus
 }
 #endif