Merge branch 'master' into pygromacs

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

diff --git a/src/gromacs/gmxana/cmat.h b/src/gromacs/gmxana/cmat.h
index 64673ec1354bba23cb7a6daf8d65c2f905834d14..63f6ca932d82a5585273545edfe6a4d5b3e2580f 100644 (file)
--- a/src/gromacs/gmxana/cmat.h
+++ b/src/gromacs/gmxana/cmat.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.
@@ -40,6 +40,11 @@
 
 #include "gromacs/legacyheaders/typedefs.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 typedef struct {
     int  i, j;
     real dist;
@@ -86,4 +91,8 @@ extern void rmsd_distribution(const char *fn, t_mat *m, const output_env_t oenv)
 
 extern t_clustid *new_clustid(int n1);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif