Use new HAVE_CCTK_<datatype> macro names.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@3795 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 59 insertions, 59 deletions

diff --git a/src/include/cctk_Complex.h b/src/include/cctk_Complex.h
index 3286b19a..e47b7e59 100644
--- a/src/include/cctk_Complex.h
+++ b/src/include/cctk_Complex.h
@@ -35,15 +35,15 @@ cctk_complex CCTK_Cmplx##Sqrt  (cctk_complex complex_number);
 
 
 /* declare complex functions for all available precisions */
-#ifdef CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx8, CCTK_REAL4, CCTK_COMPLEX8)
 #endif
 
-#ifdef CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx16, CCTK_REAL8, CCTK_COMPLEX16)
 #endif
 
-#ifdef CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 DECLARE_CMPLX_FUNCTIONS (CCTK_Cmplx32, CCTK_REAL16, CCTK_COMPLEX32)
 #endif
 
diff --git a/src/include/cctk_Types.h b/src/include/cctk_Types.h
index d9252080..af8247fe 100644
--- a/src/include/cctk_Types.h
+++ b/src/include/cctk_Types.h
@@ -29,8 +29,8 @@ typedef void (*CCTK_FPOINTER)(void);
 
 /* Structures for complex types */
 
-#ifdef CCTK_HAVE_REAL16
-#define CCTK_HAVE_COMPLEX32 1
+#ifdef HAVE_CCTK_REAL16
+#define HAVE_CCTK_COMPLEX32 1
 typedef struct
 {
   CCTK_REAL16 Re;
@@ -38,8 +38,8 @@ typedef struct
 } CCTK_COMPLEX32;
 #endif
 
-#ifdef CCTK_HAVE_REAL8
-#define CCTK_HAVE_COMPLEX16 1
+#ifdef HAVE_CCTK_REAL8
+#define HAVE_CCTK_COMPLEX16 1
 typedef struct
 {
   CCTK_REAL8 Re;
@@ -47,8 +47,8 @@ typedef struct
 } CCTK_COMPLEX16;
 #endif
 
-#ifdef CCTK_HAVE_REAL4
-#define CCTK_HAVE_COMPLEX8 1
+#ifdef HAVE_CCTK_REAL4
+#define HAVE_CCTK_COMPLEX8 1
 typedef struct
 {
   CCTK_REAL4 Re;
@@ -74,34 +74,34 @@ typedef unsigned char CCTK_BYTE;
 
 #define CCTK_STRING CCTK_POINTER
 
-#ifdef CCTK_HAVE_INT8
+#ifdef HAVE_CCTK_INT8
 #define CCTK_INT8 INTEGER*8
 #endif
-#ifdef CCTK_HAVE_INT4
+#ifdef HAVE_CCTK_INT4
 #define CCTK_INT4 INTEGER*4
 #endif
-#ifdef CCTK_HAVE_INT2
+#ifdef HAVE_CCTK_INT2
 #define CCTK_INT2 INTEGER*2
 #endif
-#ifdef CCTK_HAVE_INT1
+#ifdef HAVE_CCTK_INT1
 #define CCTK_INT1 INTEGER*1
 #endif
 
-#ifdef CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 #define CCTK_REAL16 REAL*16
-#define CCTK_HAVE_COMPLEX32 1
+#define HAVE_CCTK_COMPLEX32 1
 #define CCTK_COMPLEX32  COMPLEX*32
 #endif
 
-#ifdef CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 #define CCTK_REAL8  REAL*8
-#define CCTK_HAVE_COMPLEX16 1
+#define HAVE_CCTK_COMPLEX16 1
 #define CCTK_COMPLEX16  COMPLEX*16
 #endif
 
-#ifdef CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 #define CCTK_REAL4  REAL*4
-#define CCTK_HAVE_COMPLEX8 1
+#define HAVE_CCTK_COMPLEX8 1
 #define CCTK_COMPLEX8   COMPLEX*8
 #endif
 
diff --git a/src/include/util_Table.h b/src/include/util_Table.h
index ac9887c1..d227e890 100644
--- a/src/include/util_Table.h
+++ b/src/include/util_Table.h
@@ -183,40 +183,40 @@ int Util_TableSetChar(int handle, CCTK_CHAR value, const char *key);
 
 /* integers */
 int Util_TableSetInt(int handle, CCTK_INT value, const char *key);
-#if CCTK_HAVE_INT1
+#ifdef HAVE_CCTK_INT1
 int Util_TableSetInt1(int handle, CCTK_INT1 value, const char *key);
 #endif
-#if CCTK_HAVE_INT2
+#ifdef HAVE_CCTK_INT2
 int Util_TableSetInt2(int handle, CCTK_INT2 value, const char *key);
 #endif
-#if CCTK_HAVE_INT4
+#ifdef HAVE_CCTK_INT4
 int Util_TableSetInt4(int handle, CCTK_INT4 value, const char *key);
 #endif
-#if CCTK_HAVE_INT8
+#ifdef HAVE_CCTK_INT8
 int Util_TableSetInt8(int handle, CCTK_INT8 value, const char *key);
 #endif
 
 /* real numbers */
 int Util_TableSetReal(int handle, CCTK_REAL value, const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableSetReal4(int handle, CCTK_REAL4 value, const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableSetReal8(int handle, CCTK_REAL8 value, const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableSetReal16(int handle, CCTK_REAL16 value, const char *key);
 #endif
 
 /* complex numbers */
 int Util_TableSetComplex(int handle, CCTK_COMPLEX value, const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableSetComplex8(int handle, CCTK_COMPLEX8 value, const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableSetComplex16(int handle, CCTK_COMPLEX16 value, const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableSetComplex32(int handle, CCTK_COMPLEX32 value, const char *key);
 #endif
 
@@ -247,22 +247,22 @@ int Util_TableSetCharArray(int handle,
 int Util_TableSetIntArray(int handle,
                           int N_elements, const CCTK_INT array[],
                           const char *key);
-#if CCTK_HAVE_INT1
+#ifdef HAVE_CCTK_INT1
 int Util_TableSetInt1Array(int handle,
                            int N_elements, const CCTK_INT1 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT2
+#ifdef HAVE_CCTK_INT2
 int Util_TableSetInt2Array(int handle,
                            int N_elements, const CCTK_INT2 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT4
+#ifdef HAVE_CCTK_INT4
 int Util_TableSetInt4Array(int handle,
                            int N_elements, const CCTK_INT4 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT8
+#ifdef HAVE_CCTK_INT8
 int Util_TableSetInt8Array(int handle,
                            int N_elements, const CCTK_INT8 array[],
                            const char *key);
@@ -272,17 +272,17 @@ int Util_TableSetInt8Array(int handle,
 int Util_TableSetRealArray(int handle,
                            int N_elements, const CCTK_REAL array[],
                            const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableSetReal4Array(int handle,
                             int N_elements, const CCTK_REAL4 array[],
                             const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableSetReal8Array(int handle,
                             int N_elements, const CCTK_REAL8 array[],
                             const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableSetReal16Array(int handle,
                              int N_elements, const CCTK_REAL16 array[],
                              const char *key);
@@ -292,17 +292,17 @@ int Util_TableSetReal16Array(int handle,
 int Util_TableSetComplexArray(int handle,
                               int N_elements, const CCTK_COMPLEX array[],
                               const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableSetComplex8Array(int handle,
                                int N_elements, const CCTK_COMPLEX8 array[],
                                const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableSetComplex16Array(int handle,
                                 int N_elements, const CCTK_COMPLEX16 array[],
                                 const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableSetComplex32Array(int handle,
                                 int N_elements, const CCTK_COMPLEX32 array[],
                                 const char *key);
@@ -328,40 +328,40 @@ int Util_TableGetChar(int handle, CCTK_CHAR *value, const char *key);
 
 /* integers */
 int Util_TableGetInt(int handle, CCTK_INT *value, const char *key);
-#if CCTK_HAVE_INT1
+#ifdef HAVE_CCTK_INT1
 int Util_TableGetInt1(int handle, CCTK_INT1 *value, const char *key);
 #endif
-#if CCTK_HAVE_INT2
+#ifdef HAVE_CCTK_INT2
 int Util_TableGetInt2(int handle, CCTK_INT2 *value, const char *key);
 #endif
-#if CCTK_HAVE_INT4
+#ifdef HAVE_CCTK_INT4
 int Util_TableGetInt4(int handle, CCTK_INT4 *value, const char *key);
 #endif
-#if CCTK_HAVE_INT8
+#ifdef HAVE_CCTK_INT8
 int Util_TableGetInt8(int handle, CCTK_INT8 *value, const char *key);
 #endif
 
 /* real numbers */
 int Util_TableGetReal(int handle, CCTK_REAL *value, const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableGetReal4(int handle, CCTK_REAL4 *value, const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableGetReal8(int handle, CCTK_REAL8 *value, const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableGetReal16(int handle, CCTK_REAL16 *value, const char *key);
 #endif
 
 /* complex numbers */
 int Util_TableGetComplex(int handle, CCTK_COMPLEX *value, const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableGetComplex8(int handle, CCTK_COMPLEX8 *value, const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableGetComplex16(int handle, CCTK_COMPLEX16 *value, const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableGetComplex32(int handle, CCTK_COMPLEX32 *value, const char *key);
 #endif
 
@@ -392,22 +392,22 @@ int Util_TableGetCharArray(int handle,
 int Util_TableGetIntArray(int handle,
                           int N_elements, CCTK_INT array[],
                           const char *key);
-#if CCTK_HAVE_INT1
+#ifdef HAVE_CCTK_INT1
 int Util_TableGetInt1Array(int handle,
                            int N_elements, CCTK_INT1 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT2
+#ifdef HAVE_CCTK_INT2
 int Util_TableGetInt2Array(int handle,
                            int N_elements, CCTK_INT2 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT4
+#ifdef HAVE_CCTK_INT4
 int Util_TableGetInt4Array(int handle,
                            int N_elements, CCTK_INT4 array[],
                            const char *key);
 #endif
-#if CCTK_HAVE_INT8
+#ifdef HAVE_CCTK_INT8
 int Util_TableGetInt8Array(int handle,
                            int N_elements, CCTK_INT8 array[],
                            const char *key);
@@ -417,17 +417,17 @@ int Util_TableGetInt8Array(int handle,
 int Util_TableGetRealArray(int handle,
                            int N_elements, CCTK_REAL array[],
                            const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableGetReal4Array(int handle,
                             int N_elements, CCTK_REAL4 array[],
                             const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableGetReal8Array(int handle,
                             int N_elements, CCTK_REAL8 array[],
                             const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableGetReal16Array(int handle,
                              int N_elements, CCTK_REAL16 array[],
                              const char *key);
@@ -437,17 +437,17 @@ int Util_TableGetReal16Array(int handle,
 int Util_TableGetComplexArray(int handle,
                               int N_elements, CCTK_COMPLEX array[],
                               const char *key);
-#if CCTK_HAVE_REAL4
+#ifdef HAVE_CCTK_REAL4
 int Util_TableGetComplex8Array(int handle,
                                int N_elements, CCTK_COMPLEX8 array[],
                                const char *key);
 #endif
-#if CCTK_HAVE_REAL8
+#ifdef HAVE_CCTK_REAL8
 int Util_TableGetComplex16Array(int handle,
                                 int N_elements, CCTK_COMPLEX16 array[],
                                 const char *key);
 #endif
-#if CCTK_HAVE_REAL16
+#ifdef HAVE_CCTK_REAL16
 int Util_TableGetComplex32Array(int handle,
                                 int N_elements, CCTK_COMPLEX32 array[],
                                 const char *key);