Mercurial > hg > minc-tools

changeset 2080:800a85ed0ace

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wrap contents of volume_io.h in "extern C" declaration, if compiled with C++.
author stever <stever>
date Sun, 03 Apr 2005 18:02:54 +0000
parents c4d3f4a24c49
children 78a015bb8ef2
files ChangeLog volume_io/Include/volume_io.h
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-02  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>
+
+	* volume_io/Include/volume_io.h: Wrap contents in "extern C"
+	declaration, if compiled with C++.
+
 2005-03-31  Bert Vincent <bert@bic.mni.mcgill.ca>
 	* Port A. Janke's fix to volume_io/Prog_utils/files.c to the
 	1.X branch.  This replaces any ':' characters in a temporary
--- a/volume_io/Include/volume_io.h
+++ b/volume_io/Include/volume_io.h
@@ -1,7 +1,10 @@
-
 #ifndef  DEF_VOLUME_IO
 #define  DEF_VOLUME_IO
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ----------------------------------------------------------------------------
 @COPYRIGHT  :
               Copyright 1993,1994,1995 David MacDonald,
@@ -14,7 +17,7 @@
               make no representations about the suitability of this
               software for any purpose.  It is provided "as is" without
               express or implied warranty.
-@VERSION    : $Header: /private-cvsroot/minc/volume_io/Include/volume_io.h,v 1.11.2.2 2005-03-31 17:39:49 bert Exp $
+@VERSION    : $Header: /private-cvsroot/minc/volume_io/Include/volume_io.h,v 1.11.2.3 2005-04-03 18:02:54 stever Exp $
 ---------------------------------------------------------------------------- */
 
 /* ----------------------------- MNI Header -----------------------------------
@@ -55,4 +58,8 @@
 
 #include  <volume_io/vol_io_prototypes.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* DEF_VOLUME_IO */