1 files changed, 25 insertions, 12 deletions
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5.h b/Carpet/CarpetIOHDF5/src/iohdf5.h
index abaef7ee4..2a535c0e7 100644
--- a/Carpet/CarpetIOHDF5/src/iohdf5.h
+++ b/Carpet/CarpetIOHDF5/src/iohdf5.h
@@ -1,26 +1,39 @@
-/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.h,v 1.5 2004/05/21 18:11:34 schnetter Exp $ */
+/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.h,v 1.6 2004/07/07 11:01:05 tradke Exp $ */
 
 #ifndef CARPETIOHDF5_H
 #define CARPETIOHDF5_H
 
-#include "cctk_Arguments.h"
-
 #ifdef __cplusplus
 namespace CarpetIOHDF5 {
   extern "C" {
 #endif
     
-    /* Scheduled functions */
-    int CarpetIOHDF5Startup (void);
-    void CarpetIOHDF5Init (CCTK_ARGUMENTS);
-    void CarpetIOHDF5ReadData (CCTK_ARGUMENTS);
-    void CarpetIOHDF5_EvolutionCheckpoint (const cGH*);
-    void CarpetIOHDF5_InitialDataCheckpoint (const cGH*);
+#ifdef USE_CHRISTIANS_ROUTINES
+#include "cctk_Arguments.h"
+
+int CarpetIOHDF5Startup (void);
+void CarpetIOHDF5Init (CCTK_ARGUMENTS);
+void CarpetIOHDF5ReadData (CCTK_ARGUMENTS);
+void CarpetIOHDF5_EvolutionCheckpoint (const cGH*);
+void CarpetIOHDF5_InitialDataCheckpoint (const cGH*);
+
+#else
+
+/* Scheduled functions */
+void CarpetIOHDF5Startup (void);
+int CarpetIOHDF5Init (const cGH* const);
+int CarpetIOHDF5ReadData (const cGH* const);
+int CarpetIOHDF5_EvolutionCheckpoint (const cGH* const);
+int CarpetIOHDF5_InitialDataCheckpoint (const cGH* const);
+void CarpetIOHDF5EvolutionCheckpoint (const cGH* const);
+void CarpetIOHDF5InitialDataCheckpoint (const cGH* const);
     
-    int CarpetIOHDF5_Recover (cGH* cgh, const char *basefilename, 
-			      int called_from);
+#endif
+
+int CarpetIOHDF5_Recover (cGH* cgh, const char *basefilename, int called_from);
 
-    int CarpetIOHDF5_RecoverParameters (void);
+int CarpetIOHDF5_RecoverParameters (void);
+int CarpetIOHDF5_CloseFile (void);
 
 #ifdef __cplusplus
   } /* extern "C" */