Carpet: Use #ifdef HAVE_CCTK_* instead of #ifdef CCTK_*

darcs-hash:20060613165814-dae7b-bcc2219798f9b5385b4f76561983351bfedc4f93.gz

3 files changed, 26 insertions, 26 deletions

diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 035182d3c..db2bf706a 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -82,41 +82,41 @@ namespace Carpet {
     }
     switch (type1) {
       
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
     case CCTK_VARIABLE_REAL8:
       // This type is supported.
       return true;
 #endif
       
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
     case CCTK_VARIABLE_REAL4:
 #endif
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
     case CCTK_VARIABLE_REAL16:
 #endif
-#ifdef CCTK_REAL4 /* CCTK_COMPLEX8 */
+#ifdef HAVE_CCTK_COMPLEX8
     case CCTK_VARIABLE_COMPLEX8:
 #endif
-#ifdef CCTK_REAL8 /* CCTK_COMPLEX16 */
+#ifdef HAVE_CCTK_COMPLEX16
     case CCTK_VARIABLE_COMPLEX16:
 #endif
-#ifdef CCTK_REAL16 /* CCTK_COMPLEX32 */
+#ifdef HAVE_CCTK_COMPLEX32
     case CCTK_VARIABLE_COMPLEX32:
 #endif
       // This type is not supported, but could be.
       return false;
       
     case CCTK_VARIABLE_BYTE:
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
     case CCTK_VARIABLE_INT1:
 #endif
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
     case CCTK_VARIABLE_INT2:
 #endif
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
     case CCTK_VARIABLE_INT4:
 #endif
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
     case CCTK_VARIABLE_INT8:
 #endif
       // This type is not supported, and cannot be.
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index ebf606a68..e76c0cf36 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -151,19 +151,19 @@ namespace Carpet {
       return CarpetMPIDatatype (CCTK_VARIABLE_REAL);
 #endif
 #ifdef CARPET_COMPLEX8
-#  ifdef CCTK_REAL4
+#  ifdef HAVE_CCTK_COMPLEX8
     case CCTK_VARIABLE_COMPLEX8:
       return CarpetMPIDatatype (CCTK_VARIABLE_REAL4);
 #  endif
 #endif
 #ifdef CARPET_COMPLEX16
-#  ifdef CCTK_REAL8
+#  ifdef HAVE_CCTK_COMPLEX16
     case CCTK_VARIABLE_COMPLEX16:
       return CarpetMPIDatatype (CCTK_VARIABLE_REAL8);
 #  endif
 #endif
 #ifdef CARPET_COMPLEX32
-#  ifdef CCTK_REAL16
+#  ifdef HAVE_CCTK_COMPLEX32
     case CCTK_VARIABLE_COMPLEX32:
       return CarpetMPIDatatype (CCTK_VARIABLE_REAL16);
 #  endif
@@ -182,17 +182,17 @@ namespace Carpet {
     case CCTK_VARIABLE_COMPLEX:
 #endif
 #ifdef CARPET_COMPLEX8
-#  ifdef CCTK_REAL4
+#  ifdef HAVE_CCTK_COMPLEX8
     case CCTK_VARIABLE_COMPLEX8:
 #  endif
 #endif
 #ifdef CARPET_COMPLEX16
-#  ifdef CCTK_REAL8
+#  ifdef HAVE_CCTK_COMPLEX16
     case CCTK_VARIABLE_COMPLEX16:
 #  endif
 #endif
 #ifdef CARPET_COMPLEX32
-#  ifdef CCTK_REAL16
+#  ifdef HAVE_CCTK_COMPLEX32
     case CCTK_VARIABLE_COMPLEX32:
 #  endif
 #endif
diff --git a/Carpet/Carpet/src/typecase b/Carpet/Carpet/src/typecase
index e3b05b43d..107550e83 100644
--- a/Carpet/Carpet/src/typecase
+++ b/Carpet/Carpet/src/typecase
@@ -126,22 +126,22 @@ TYPECASE(CCTK_VARIABLE_BYTE, CCTK_BYTE)
 TYPECASE(CCTK_VARIABLE_INT, CCTK_INT)
 #endif
 #ifdef CARPET_INT1
-#  ifdef CCTK_INT1
+#  ifdef HAVE_CCTK_INT1
 TYPECASE(CCTK_VARIABLE_INT1, CCTK_INT1)
 #  endif
 #endif
 #ifdef CARPET_INT2
-#  ifdef CCTK_INT2
+#  ifdef HAVE_CCTK_INT2
 TYPECASE(CCTK_VARIABLE_INT2, CCTK_INT2)
 #  endif
 #endif
 #ifdef CARPET_INT4
-#  ifdef CCTK_INT4
+#  ifdef HAVE_CCTK_INT4
 TYPECASE(CCTK_VARIABLE_INT4, CCTK_INT4)
 #  endif
 #endif
 #ifdef CARPET_INT8
-#  ifdef CCTK_INT8
+#  ifdef HAVE_CCTK_INT8
 TYPECASE(CCTK_VARIABLE_INT8, CCTK_INT8)
 #  endif
 #endif
@@ -150,17 +150,17 @@ TYPECASE(CCTK_VARIABLE_INT8, CCTK_INT8)
 TYPECASE(CCTK_VARIABLE_REAL, CCTK_REAL)
 #endif
 #ifdef CARPET_REAL4
-#  ifdef CCTK_REAL4
+#  ifdef HAVE_CCTK_REAL4
 TYPECASE(CCTK_VARIABLE_REAL4, CCTK_REAL4)
 #  endif
 #endif
 #ifdef CARPET_REAL8
-#  ifdef CCTK_REAL8
+#  ifdef HAVE_CCTK_REAL8
 TYPECASE(CCTK_VARIABLE_REAL8, CCTK_REAL8)
 #  endif
 #endif
 #ifdef CARPET_REAL16
-#  ifdef CCTK_REAL16
+#  ifdef HAVE_CCTK_REAL16
 TYPECASE(CCTK_VARIABLE_REAL16, CCTK_REAL16)
 #  endif
 #endif
@@ -169,17 +169,17 @@ TYPECASE(CCTK_VARIABLE_REAL16, CCTK_REAL16)
 TYPECASE(CCTK_VARIABLE_COMPLEX, CCTK_COMPLEX)
 #endif
 #ifdef CARPET_COMPLEX8
-#  ifdef CCTK_REAL4
+#  ifdef HAVE_CCTK_COMPLEX8
 TYPECASE(CCTK_VARIABLE_COMPLEX8, CCTK_COMPLEX8)
 #  endif
 #endif
 #ifdef CARPET_COMPLEX16
-#  ifdef CCTK_REAL8
+#  ifdef HAVE_CCTK_COMPLEX16
 TYPECASE(CCTK_VARIABLE_COMPLEX16, CCTK_COMPLEX16)
 #  endif
 #endif
 #ifdef CARPET_COMPLEX32
-#  ifdef CCTK_REAL16
+#  ifdef HAVE_CCTK_COMPLEX32
 TYPECASE(CCTK_VARIABLE_COMPLEX32, CCTK_COMPLEX32)
 #  endif
 #endif