1 files changed, 6 insertions, 6 deletions
diff --git a/src/AvgFunctions.c b/src/AvgFunctions.c
index 81608ce..c3139c8 100644
--- a/src/AvgFunctions.c
+++ b/src/AvgFunctions.c
@@ -497,7 +497,7 @@ int LocalReduce_Avg_INT(int i, int weight_on, const void * const weight, CCTK_IN
   return 0;
 }
 
-#ifdef CCTK_VARIABLE_INT1
+#ifdef HAVE_CCTK_INT1
 int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;
@@ -738,7 +738,7 @@ int LocalReduce_Avg_INT1(int i, int weight_on, const void * const weight, CCTK_I
 }
 #endif                                                              
 
-#ifdef CCTK_VARIABLE_INT2
+#ifdef HAVE_CCTK_INT2
 int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;
@@ -979,7 +979,7 @@ int LocalReduce_Avg_INT2(int i, int weight_on, const void * const weight, CCTK_I
 }
 #endif
 
-#ifdef CCTK_VARIABLE_INT4
+#ifdef HAVE_CCTK_INT4
 int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;
@@ -1220,7 +1220,7 @@ int LocalReduce_Avg_INT4(int i, int weight_on, const void * const weight, CCTK_I
 }
 #endif
 
-#ifdef CCTK_VARIABLE_INT8
+#ifdef HAVE_CCTK_INT8
 int LocalReduce_Avg_INT8(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;
@@ -1700,7 +1700,7 @@ int LocalReduce_Avg_REAL(int i, int weight_on, const void * const weight, CCTK_I
   return 0;
 }
 
-#ifdef CCTK_VARIABLE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;
@@ -1941,7 +1941,7 @@ int LocalReduce_Avg_REAL4(int i, int weight_on, const void * const weight, CCTK_
 }
 #endif
 
-#ifdef CCTK_VARIABLE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int LocalReduce_Avg_REAL8(int i, int weight_on, const void * const weight, CCTK_INT * input_array_offsets, int * indices, int max_iter, int * actual_indices, CCTK_INT * input_array_strides, CCTK_INT * input_array_min_subscripts,const CCTK_INT * input_array_dims, int num_points, int * actual_iters_per_dim, int * iters_per_dim,    int N_dims, const void *const input_arrays[], const CCTK_INT output_number_type_codes[], void * const output_numbers[], int param_table_handle)
 {
   int iter = 0;