Move read_tps_conf() to confio.h

[alexxy/gromacs.git] / src / gromacs / gmxana / sfactor.c

diff --git a/src/gromacs/gmxana/sfactor.c b/src/gromacs/gmxana/sfactor.c
index 5da3cfcb2e76811dbd51ab2e396e0e8b01927020..3fcb408faf15c8b9782a6fb0ba4a3d2e14266e96 100644 (file)
--- a/src/gromacs/gmxana/sfactor.c
+++ b/src/gromacs/gmxana/sfactor.c
@@ -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.
@@ -34,24 +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.
  */
-#include "config.h"
+#include "gmxpre.h"
 
-#include "gromacs/utility/smalloc.h"
-#include "gromacs/utility/futil.h"
-#include "gromacs/math/utilities.h"
-#include "gromacs/utility/fatalerror.h"
-#include "gromacs/math/vec.h"
-#include "macros.h"
-#include "gromacs/topology/index.h"
+#include "sfactor.h"
+
+#include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/strdb.h"
-#include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
-#include "typedefs.h"
-#include "oenv.h"
-#include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/xvgr.h"
-#include "names.h"
-#include "sfactor.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/legacyheaders/oenv.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/math/utilities.h"
+#include "gromacs/math/vec.h"
+#include "gromacs/topology/index.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 
 typedef struct gmx_structurefactors {
@@ -593,7 +594,7 @@ extern void save_data (structure_factor_t *sft, const char *file, int ngrps,
         }
     }
 
-    gmx_ffclose (fp);
+    xvgrclose (fp);
 }