Use #ifdef HAVE_CCTK_REAL8 instead of #ifdef CCTK_REAL8

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@532 b61c5cb5-eaca-4651-9a7a-d64986f99364

3 files changed, 20 insertions, 20 deletions

diff --git a/src/PughUtils.c b/src/PughUtils.c
index 621cc48..293c9cf 100644
--- a/src/PughUtils.c
+++ b/src/PughUtils.c
@@ -252,27 +252,27 @@ MPI_Datatype PUGH_MPIDataType (const pGH *pughGH, int cctk_type)
     case CCTK_VARIABLE_INT:       retval = PUGH_MPI_INT; break;
     case CCTK_VARIABLE_REAL:      retval = PUGH_MPI_REAL; break;
     case CCTK_VARIABLE_COMPLEX:   retval = pughGH->PUGH_mpi_complex; break;
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
     case CCTK_VARIABLE_INT1:      retval = PUGH_MPI_INT1; break;
 #endif
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
     case CCTK_VARIABLE_INT2:      retval = PUGH_MPI_INT2; break;
 #endif
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
     case CCTK_VARIABLE_INT4:      retval = PUGH_MPI_INT4; break;
 #endif
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
     case CCTK_VARIABLE_INT8:      retval = PUGH_MPI_INT8; break;
 #endif
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
     case CCTK_VARIABLE_REAL4:     retval = PUGH_MPI_REAL4; break;
     case CCTK_VARIABLE_COMPLEX8:  retval = pughGH->PUGH_mpi_complex8; break;
 #endif
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
     case CCTK_VARIABLE_REAL8:     retval = PUGH_MPI_REAL8; break;
     case CCTK_VARIABLE_COMPLEX16: retval = pughGH->PUGH_mpi_complex16; break;
 #endif
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
     case CCTK_VARIABLE_REAL16:    retval = PUGH_MPI_REAL16; break;
     case CCTK_VARIABLE_COMPLEX32: retval = pughGH->PUGH_mpi_complex32; break;
 #endif
diff --git a/src/SetupPGH.c b/src/SetupPGH.c
index 5e81705..5abf1cc 100644
--- a/src/SetupPGH.c
+++ b/src/SetupPGH.c
@@ -258,13 +258,13 @@ void PUGH_DestroyPGH (pGH **GHin)
   CACTUS_MPI_ERROR (MPI_Comm_free (&GH->PUGH_COMM_WORLD));
 
   CACTUS_MPI_ERROR (MPI_Type_free (&GH->PUGH_mpi_complex));
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
   CACTUS_MPI_ERROR (MPI_Type_free (&GH->PUGH_mpi_complex8));
 #endif
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
   CACTUS_MPI_ERROR (MPI_Type_free (&GH->PUGH_mpi_complex16));
 #endif
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
   CACTUS_MPI_ERROR (MPI_Type_free (&GH->PUGH_mpi_complex32));
 #endif
 #endif
@@ -751,17 +751,17 @@ static int Setup_nProcs (pGH *pughGH, int dim)
   CACTUS_MPI_ERROR (MPI_Type_commit (&pughGH->PUGH_mpi_complex));
 
   /* dito for fixed-precision reals */
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
   CACTUS_MPI_ERROR (MPI_Type_contiguous (2, PUGH_MPI_REAL4,
                                          &pughGH->PUGH_mpi_complex8));
   CACTUS_MPI_ERROR (MPI_Type_commit (&pughGH->PUGH_mpi_complex8));
 #endif
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
   CACTUS_MPI_ERROR (MPI_Type_contiguous (2, PUGH_MPI_REAL8,
                                          &pughGH->PUGH_mpi_complex16));
   CACTUS_MPI_ERROR (MPI_Type_commit (&pughGH->PUGH_mpi_complex16));
 #endif
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
   CACTUS_MPI_ERROR (MPI_Type_contiguous (2, PUGH_MPI_REAL16,
                                          &pughGH->PUGH_mpi_complex32));
   CACTUS_MPI_ERROR (MPI_Type_commit (&pughGH->PUGH_mpi_complex32));
diff --git a/src/include/pugh.h b/src/include/pugh.h
index 8c528af..28b3f50 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -32,13 +32,13 @@
 
    PUGH_MPI_REAL  is used for communicating reals of the generic CCTK_REAL type
    PUGH_MPI_REALn is used to explicitely communicate n-byte reals */
-#ifdef  CCTK_REAL4
+#ifdef  HAVE_CCTK_REAL4
 #define PUGH_MPI_REAL4  MPI_FLOAT
 #endif
-#ifdef  CCTK_REAL8
+#ifdef  HAVE_CCTK_REAL8
 #define PUGH_MPI_REAL8  MPI_DOUBLE
 #endif
-#ifdef  CCTK_REAL16
+#ifdef  HAVE_CCTK_REAL16
 #define PUGH_MPI_REAL16  (sizeof (CCTK_REAL16) == sizeof (long double) ?      \
                           MPI_LONG_DOUBLE : MPI_DATATYPE_NULL)
 #endif
@@ -60,25 +60,25 @@
 /* integer types are architecture-dependent:
    PUGH_MPI_INT  is used for communicating integers of the generic CCTK_INT type
    PUGH_MPI_INTn is used to explicitely communicate n-byte integers */
-#ifdef  CCTK_INT8
+#ifdef  HAVE_CCTK_INT8
 #define PUGH_MPI_INT8  (sizeof (CCTK_INT8) == sizeof (int) ? MPI_INT :        \
                         sizeof (CCTK_INT8) == sizeof (long) ? MPI_LONG :      \
                         sizeof (CCTK_INT8) == sizeof (long long) ?            \
                         MPI_LONG_LONG_INT : MPI_DATATYPE_NULL)
 #endif
 
-#ifdef  CCTK_INT4
+#ifdef  HAVE_CCTK_INT4
 #define PUGH_MPI_INT4  (sizeof (CCTK_INT4) == sizeof (int) ? MPI_INT :        \
                         sizeof (CCTK_INT4) == sizeof (short) ? MPI_SHORT :    \
                         MPI_DATATYPE_NULL)
 #endif
 
-#ifdef  CCTK_INT2
+#ifdef  HAVE_CCTK_INT2
 #define PUGH_MPI_INT2  (sizeof (CCTK_INT2) == sizeof (short) ? MPI_SHORT :    \
                         MPI_DATATYPE_NULL)
 #endif
 
-#ifdef  CCTK_INT1
+#ifdef  HAVE_CCTK_INT1
 #define PUGH_MPI_INT1  MPI_CHAR
 #endif