Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxana/hxprops.h b/src/gromacs/gmxana/hxprops.h
index c6242d76b7aff725d19d8418ccf49c7485cc6345..9499c5b6bcb5146b6a5fb3c27fb013b5645523c3 100644 (file)
--- a/src/gromacs/gmxana/hxprops.h
+++ b/src/gromacs/gmxana/hxprops.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,6 +42,11 @@
 
 #include "gromacs/legacyheaders/typedefs.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define PHI_AHX (-55.0)
 #define PSI_AHX (-45.0)
 /* Canonical values of the helix phi/psi angles */
@@ -111,4 +116,8 @@ extern void calc_hxprops(int nres, t_bb bb[], rvec x[]);
 
 extern void pr_bb(FILE *fp, int nres, t_bb bb[]);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif