Fixed quite a few include guard mishaps.

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

2 files changed, 27 insertions, 11 deletions

diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h
index d92668109..b5d9a1ea3 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h
@@ -1,7 +1,22 @@
-// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h,v 1.2 2001/03/17 22:37:28 eschnett Exp $
+/* $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.h,v 1.3 2002/09/01 14:52:26 schnetter Exp $ */
+
+#ifndef CARPETIOFLEXIO_H
+#define CARPETIOFLEXIO_H
 
-#include "cctk.h"
 #include "cctk_Arguments.h"
 
-int CarpetIOFlexIOStartup (void);
-int CarpetIOFlexIOReadData (CCTK_ARGUMENTS);
+#ifdef __cplusplus
+namespace CarpetIOFlexIO {
+  extern "C" {
+#endif
+    
+    /* Scheduled functions */
+    int CarpetIOFlexIOStartup (void);
+    int CarpetIOFlexIOReadData (CCTK_ARGUMENTS);
+    
+#ifdef __cplusplus
+  } /* extern "C" */
+} /* namespace CarpetIOASCII */
+#endif
+
+#endif /* !defined(CARPETIOFLEXIO_H) */
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
index 31bcb9cc5..123869dbd 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
@@ -1,10 +1,15 @@
-// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.4 2001/11/05 17:53:04 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.5 2002/09/01 14:52:26 schnetter Exp $
+
+#ifndef CARPETIOFLEXIO_HH
+#define CARPETIOFLEXIO_HH
 
 #include <vector>
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
 
+#include "ioflexio.h"
+
 namespace CarpetIOFlexIO {
   
   // Variable definitions
@@ -13,12 +18,6 @@ namespace CarpetIOFlexIO {
   extern vector<bool> do_truncate;
   extern vector<vector<int> > last_output;
   
-  // Scheduled functions
-  extern "C" {
-    int CarpetIOFlexIOStartup ();
-    int CarpetIOFlexIOReadData (CCTK_ARGUMENTS);
-  }
-  
   void* SetupGH (tFleshConfig* const fc,
 		 const int convLevel, cGH* const cgh);
   
@@ -33,3 +32,5 @@ namespace CarpetIOFlexIO {
 		  const char* const alias);
   
 } // namespace CarpetIOFlexIO
+
+#endif // !defined(CARPETIOFLEXIO_HH)