Use #ifdef HAVE_CCTK_REAL8 instead of #ifdef CCTK_REAL8svn

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGHReduce/trunk@113 d60812e6-3970-4df4-986e-c251b06effeb

10 files changed, 85 insertions, 85 deletions

diff --git a/src/Reduction.c b/src/Reduction.c
index 02564d1..0225ede 100644
--- a/src/Reduction.c
+++ b/src/Reduction.c
@@ -570,7 +570,7 @@ static int copy_real_to_outtype (int num_elems,
       _outarray[i] = (CCTK_INT) inarray[i];
     }
   }
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
   else if (outtype == CCTK_VARIABLE_INT1)
   {
     CCTK_INT1 *_outarray = (CCTK_INT1 *) outarray;
@@ -582,7 +582,7 @@ static int copy_real_to_outtype (int num_elems,
     }
   }
 #endif
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
   else if (outtype == CCTK_VARIABLE_INT2)
   {
     CCTK_INT2 *_outarray = (CCTK_INT2 *) outarray;
@@ -594,7 +594,7 @@ static int copy_real_to_outtype (int num_elems,
     }
   }
 #endif
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
   else if (outtype == CCTK_VARIABLE_INT4)
   {
     CCTK_INT4 *_outarray = (CCTK_INT4 *) outarray;
@@ -606,7 +606,7 @@ static int copy_real_to_outtype (int num_elems,
     }
   }
 #endif
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
   else if (outtype == CCTK_VARIABLE_INT8)
   {
     CCTK_INT8 *_outarray = (CCTK_INT8 *) outarray;
@@ -628,7 +628,7 @@ static int copy_real_to_outtype (int num_elems,
       _outarray[i] = (CCTK_REAL) inarray[i];
     }
   }
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
   else if (outtype == CCTK_VARIABLE_REAL4)
   {
     CCTK_REAL4 *_outarray = (CCTK_REAL4 *) outarray;
@@ -640,7 +640,7 @@ static int copy_real_to_outtype (int num_elems,
     }
   }
 #endif
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
   else if (outtype == CCTK_VARIABLE_REAL8)
   {
         CCTK_REAL8 *_outarray = (CCTK_REAL8 *) outarray;
@@ -652,7 +652,7 @@ static int copy_real_to_outtype (int num_elems,
         }
   }
 #endif
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
   else if (outtype == CCTK_VARIABLE_REAL16)
   {
     CCTK_REAL16 *_outarray = (CCTK_REAL16 *) outarray;
diff --git a/src/ReductionAvg.c b/src/ReductionAvg.c
index ba5746a..8e43a51 100644
--- a/src/ReductionAvg.c
+++ b/src/ReductionAvg.c
@@ -247,7 +247,7 @@ static int ReductionAvg (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -255,7 +255,7 @@ static int ReductionAvg (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -263,7 +263,7 @@ static int ReductionAvg (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -271,7 +271,7 @@ static int ReductionAvg (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -285,7 +285,7 @@ static int ReductionAvg (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -293,7 +293,7 @@ static int ReductionAvg (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -301,7 +301,7 @@ static int ReductionAvg (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
diff --git a/src/ReductionMax.c b/src/ReductionMax.c
index fc6c8d1..4d39af4 100644
--- a/src/ReductionMax.c
+++ b/src/ReductionMax.c
@@ -248,7 +248,7 @@ static int ReductionMaxVal (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
       break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -256,7 +256,7 @@ static int ReductionMaxVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -264,7 +264,7 @@ static int ReductionMaxVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -272,7 +272,7 @@ static int ReductionMaxVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -286,7 +286,7 @@ static int ReductionMaxVal (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -294,7 +294,7 @@ static int ReductionMaxVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -302,7 +302,7 @@ static int ReductionMaxVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
diff --git a/src/ReductionMin.c b/src/ReductionMin.c
index e848c1e..8e1a301 100644
--- a/src/ReductionMin.c
+++ b/src/ReductionMin.c
@@ -249,7 +249,7 @@ static int ReductionMinVal (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -257,7 +257,7 @@ static int ReductionMinVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -265,7 +265,7 @@ static int ReductionMinVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -273,7 +273,7 @@ static int ReductionMinVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -287,7 +287,7 @@ static int ReductionMinVal (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -295,7 +295,7 @@ static int ReductionMinVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -303,7 +303,7 @@ static int ReductionMinVal (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
diff --git a/src/ReductionNorm1.c b/src/ReductionNorm1.c
index cdfb197..770ce03 100644
--- a/src/ReductionNorm1.c
+++ b/src/ReductionNorm1.c
@@ -252,7 +252,7 @@ static int ReductionNorm1 (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -260,7 +260,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -268,7 +268,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -276,7 +276,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -290,7 +290,7 @@ static int ReductionNorm1 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -298,7 +298,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -306,7 +306,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -322,7 +322,7 @@ static int ReductionNorm1 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar)   norm1 += CCTK_Cmplx8Abs (scalar)
         ITERATE_ARRAY (CCTK_COMPLEX8, num_dims, inarrays[i],
@@ -331,7 +331,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar)   norm1 += CCTK_Cmplx16Abs (scalar)
         ITERATE_ARRAY (CCTK_COMPLEX16, num_dims, inarrays[i],
@@ -340,7 +340,7 @@ static int ReductionNorm1 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar)   norm1 += CCTK_Cmplx32Abs (scalar)
         ITERATE_ARRAY (CCTK_COMPLEX32, num_dims, inarrays[i],
diff --git a/src/ReductionNorm2.c b/src/ReductionNorm2.c
index 5eb9c3b..d94c55d 100644
--- a/src/ReductionNorm2.c
+++ b/src/ReductionNorm2.c
@@ -251,7 +251,7 @@ static int ReductionNorm2 (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -259,7 +259,7 @@ static int ReductionNorm2 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -267,7 +267,7 @@ static int ReductionNorm2 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -275,7 +275,7 @@ static int ReductionNorm2 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -289,7 +289,7 @@ static int ReductionNorm2 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -297,7 +297,7 @@ static int ReductionNorm2 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -305,7 +305,7 @@ static int ReductionNorm2 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -322,21 +322,21 @@ static int ReductionNorm2 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
         ITERATE_ARRAY (CCTK_COMPLEX8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL4, outvals, num_outvals, total_outvals);
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
         ITERATE_ARRAY (CCTK_COMPLEX16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL8, outvals, num_outvals, total_outvals);
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
         ITERATE_ARRAY (CCTK_COMPLEX32, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL16, outvals, num_outvals, total_outvals);
diff --git a/src/ReductionNorm3.c b/src/ReductionNorm3.c
index 63a8b88..a6b5a79 100644
--- a/src/ReductionNorm3.c
+++ b/src/ReductionNorm3.c
@@ -250,7 +250,7 @@ static int ReductionNorm3 (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -258,7 +258,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -266,7 +266,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -274,7 +274,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -288,7 +288,7 @@ static int ReductionNorm3 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -296,7 +296,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -304,7 +304,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -322,7 +322,7 @@ static int ReductionNorm3 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar) \
         norm1 += CUBE (CCTK_Cmplx8Abs (scalar))
@@ -332,7 +332,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar) \
         norm1 += CUBE (CCTK_Cmplx16Abs (scalar))
@@ -342,7 +342,7 @@ static int ReductionNorm3 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm1, scalar) \
         norm1 += CUBE (CCTK_Cmplx32Abs (scalar))
diff --git a/src/ReductionNorm4.c b/src/ReductionNorm4.c
index bba43ce..7502910 100644
--- a/src/ReductionNorm4.c
+++ b/src/ReductionNorm4.c
@@ -249,7 +249,7 @@ static int ReductionNorm4 (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -257,7 +257,7 @@ static int ReductionNorm4 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -265,7 +265,7 @@ static int ReductionNorm4 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -273,7 +273,7 @@ static int ReductionNorm4 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -287,7 +287,7 @@ static int ReductionNorm4 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -295,7 +295,7 @@ static int ReductionNorm4 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -303,7 +303,7 @@ static int ReductionNorm4 (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -321,21 +321,21 @@ static int ReductionNorm4 (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
         ITERATE_ARRAY (CCTK_COMPLEX8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL4, outvals, num_outvals, total_outvals);
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
         ITERATE_ARRAY (CCTK_COMPLEX16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL8, outvals, num_outvals, total_outvals);
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
         ITERATE_ARRAY (CCTK_COMPLEX32, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
                        CCTK_REAL16, outvals, num_outvals, total_outvals);
diff --git a/src/ReductionNormInf.c b/src/ReductionNormInf.c
index 6b484d3..cb312df 100644
--- a/src/ReductionNormInf.c
+++ b/src/ReductionNormInf.c
@@ -264,7 +264,7 @@ static int ReductionNormInf (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -272,7 +272,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -280,7 +280,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -288,7 +288,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -302,7 +302,7 @@ static int ReductionNormInf (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -310,7 +310,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -318,7 +318,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -334,7 +334,7 @@ static int ReductionNormInf (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm_inf, scalar)   norm_inf = MAX(norm_inf, CCTK_Cmplx8Abs(scalar))
         ITERATE_ARRAY (CCTK_COMPLEX8, num_dims, inarrays[i],
@@ -343,7 +343,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm_inf, scalar)   norm_inf = MAX(norm_inf, CCTK_Cmplx16Abs(scalar))
         ITERATE_ARRAY (CCTK_COMPLEX16, num_dims, inarrays[i],
@@ -352,7 +352,7 @@ static int ReductionNormInf (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
 #undef  REDUCTION_OPERATION
 #define REDUCTION_OPERATION(norm_inf, scalar)   norm_inf = MAX(norm_inf, CCTK_Cmplx32Abs(scalar))
         ITERATE_ARRAY (CCTK_COMPLEX32, num_dims, inarrays[i],
diff --git a/src/ReductionSum.c b/src/ReductionSum.c
index 62a2881..6c43739 100644
--- a/src/ReductionSum.c
+++ b/src/ReductionSum.c
@@ -247,7 +247,7 @@ static int ReductionSum (const cGH *GH,
                        CCTK_INT, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         ITERATE_ARRAY (CCTK_INT1, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -255,7 +255,7 @@ static int ReductionSum (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         ITERATE_ARRAY (CCTK_INT2, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -263,7 +263,7 @@ static int ReductionSum (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         ITERATE_ARRAY (CCTK_INT4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -271,7 +271,7 @@ static int ReductionSum (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         ITERATE_ARRAY (CCTK_INT8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -285,7 +285,7 @@ static int ReductionSum (const cGH *GH,
                        CCTK_REAL, outvals, num_outvals, total_outvals);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ITERATE_ARRAY (CCTK_REAL4, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -293,7 +293,7 @@ static int ReductionSum (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ITERATE_ARRAY (CCTK_REAL8, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,
@@ -301,7 +301,7 @@ static int ReductionSum (const cGH *GH,
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ITERATE_ARRAY (CCTK_REAL16, num_dims, inarrays[i],
                        from, to, iterator, points_per_dim,