Fixed quite a few include guard mishaps.

darcs-hash:20020901125223-07bb3-f494618480c1ffc46118365c4c957d7a313d7be9.gz

1 files changed, 20 insertions, 11 deletions

diff --git a/Carpet/Carpet/src/carpet_public.h b/Carpet/Carpet/src/carpet_public.h
index 1fa8e4fe1..f84ae50fc 100644
--- a/Carpet/Carpet/src/carpet_public.h
+++ b/Carpet/Carpet/src/carpet_public.h
@@ -1,21 +1,30 @@
-/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.h,v 1.5 2001/12/14 16:39:09 schnetter Exp $ */
+/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.h,v 1.6 2002/09/01 14:52:24 schnetter Exp $ */
 
 #ifndef CARPET_PUBLIC_H
 #define CARPET_PUBLIC_H
 
 #include <mpi.h>
 
-#include "cctk.h"
 #include "cctk_Arguments.h"
 
 
 
-/* Scheduled functions */
-int CarpetParamCheck (CCTK_ARGUMENTS);
-int CarpetStartup (void);
-
-/* Helper functions */
-MPI_Comm CarpetMPIComm (void);
-MPI_Datatype CarpetMPIDatatype (int vartype);
-
-#endif /* ! defined(CARPET_PUBLIC_H) */
+#ifdef __cplusplus
+namespace Carpet {
+  extern "C" {
+#endif
+    
+    /* Scheduled functions */
+    int CarpetParamCheck (CCTK_ARGUMENTS);
+    int CarpetStartup (void);
+    
+    /* Helper functions */
+    MPI_Comm CarpetMPIComm (void);
+    MPI_Datatype CarpetMPIDatatype (int vartype);
+    
+#ifdef __cplusplus
+  } /* extern "C" */
+} /* namespace Carpet */
+#endif
+
+#endif /* !defined(CARPET_PUBLIC_H) */