From f7b24953a3983e298ae3de78d9ec79eee62c311a Mon Sep 17 00:00:00 2001
From: schnetter <schnetter@6a38eb6e-646e-4a02-a296-d141613ad6c4>
Date: Thu, 5 Oct 2006 17:05:57 +0000
Subject: Convert expressions explicitly to int before passing them to printf.

Use #ifdef HAVE_CCTK_REAL4 instead of #ifdef CCTK_REAL4.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@291 6a38eb6e-646e-4a02-a296-d141613ad6c4
---
 src/ScalarBoundary.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ScalarBoundary.c b/src/ScalarBoundary.c
index c7fda74..e978344 100644
--- a/src/ScalarBoundary.c
+++ b/src/ScalarBoundary.c
@@ -129,7 +129,7 @@ CCTK_INT BndScalar(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars, CCTK_INT *f
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Scalar boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Scalar bcs to all (external) faces.", faces[i],
+                 "Applying Scalar bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
     dir = 0; /* apply bc to all faces */
@@ -1170,37 +1170,37 @@ static int ApplyBndScalar (const cGH *GH,
       case CCTK_VARIABLE_REAL:
         SCALAR_BOUNDARY (CCTK_REAL, CCTK_REAL); break;
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         SCALAR_BOUNDARY (CCTK_INT1, CCTK_INT1); break;
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         SCALAR_BOUNDARY (CCTK_INT2, CCTK_INT2); break;
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         SCALAR_BOUNDARY (CCTK_INT4, CCTK_INT4); break;
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         SCALAR_BOUNDARY (CCTK_INT8, CCTK_INT8); break;
 #endif
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         SCALAR_BOUNDARY (CCTK_REAL4, CCTK_REAL4); break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         SCALAR_BOUNDARY (CCTK_REAL8, CCTK_REAL8); break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         SCALAR_BOUNDARY (CCTK_REAL16, CCTK_REAL16); break;
 #endif
-- 
cgit v1.2.3