Merge branch 'master' into pygromacs

[alexxy/gromacs.git] / src / gromacs / gmxana / fitahx.h

diff --git a/src/gromacs/gmxana/fitahx.h b/src/gromacs/gmxana/fitahx.h
index 399028ef054e7de3da18a4b06e4ff7e98d124395..d7032a1640ec2301d80b2e1497ce2234cd85f155 100644 (file)
--- a/src/gromacs/gmxana/fitahx.h
+++ b/src/gromacs/gmxana/fitahx.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.
@@ -42,7 +42,16 @@
 #include "gromacs/gmxana/hxprops.h"
 #include "gromacs/legacyheaders/typedefs.h"
 
-extern real fit_ahx(int nres, t_bb bb[], int natoms, int nall, atom_id allindex[],
-                    rvec x[], int nca, atom_id caindex[], gmx_bool bFit);
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+real fit_ahx(int nres, t_bb bb[], int natoms, int nall, atom_id allindex[],
+             rvec x[], int nca, atom_id caindex[], gmx_bool bFit);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif