Do not check for #defined constants.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Slab/trunk@36 2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8

1 files changed, 9 insertions, 7 deletions

diff --git a/src/slab.c b/src/slab.c
index f2bc3bd..fb2c495 100644
--- a/src/slab.c
+++ b/src/slab.c
@@ -407,32 +407,34 @@ static MPI_Datatype mpi_type (int const cactustype)
   int const normaltype = normal_type (cactustype);
   switch (normaltype) {
   case CCTK_VARIABLE_BYTE: return CACTUS_MPI_BYTE;
-#if defined CCTK_INT1 && defined CACTUS_MPI_INT1
+#ifdef CCTK_INT1
   case CCTK_VARIABLE_INT1: return CACTUS_MPI_INT1;
 #endif
-#if defined CCTK_INT2 && defined CACTUS_MPI_INT2
+#ifdef CCTK_INT2
   case CCTK_VARIABLE_INT2: return CACTUS_MPI_INT2;
 #endif
-#if defined CCTK_INT4 && defined CACTUS_MPI_INT4
+#ifdef CCTK_INT4
   case CCTK_VARIABLE_INT4: return CACTUS_MPI_INT4;
 #endif
-#if defined CCTK_INT8 && defined CACTUS_MPI_INT8
+#ifdef CCTK_INT8
   case CCTK_VARIABLE_INT8: return CACTUS_MPI_INT8;
 #endif
-#if defined CCTK_REAL4 && defined CACTUS_MPI_REAL4
+#ifdef CCTK_REAL4
   case CCTK_VARIABLE_REAL4: return CACTUS_MPI_REAL4;
   case CCTK_VARIABLE_COMPLEX8: return CACTUS_MPI_COMPLEX8;
 #endif
-#if defined CCTK_REAL8 && defined CACTUS_MPI_REAL8
+#ifdef CCTK_REAL8
   case CCTK_VARIABLE_REAL8: return CACTUS_MPI_REAL8;
   case CCTK_VARIABLE_COMPLEX16: return CACTUS_MPI_COMPLEX16;
 #endif
-#if defined CCTK_REAL16 && defined CACTUS_MPI_REAL16
+#ifdef CCTK_REAL16
   case CCTK_VARIABLE_REAL16: return CACTUS_MPI_REAL16;
   case CCTK_VARIABLE_COMPLEX32: return CACTUS_MPI_COMPLEX32;
 #endif
   }
   assert (0);
+  CCTK_WARN (0, "internal error");
+  return CACTUS_MPI_BYTE;       /* not reached */
 }