Do not define CCTK_L2_CACHE_SIZE and CCTK_L2_CACHELINE_BYTES macros anymore.

They have been depricated in beta13.


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

1 files changed, 45 insertions, 93 deletions

diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in
index f2f7b07e..723bf694 100644
--- a/lib/make/cctk_Config.h.in
+++ b/lib/make/cctk_Config.h.in
@@ -8,56 +8,14 @@
 /* Define if standard C headers are available. */
 #undef STDC_HEADERS
 
-/* Size info for various types */
-
-/* The number of bytes in a short int.  */
-#undef SIZEOF_SHORT_INT
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a long int.  */
-#undef SIZEOF_LONG_INT
-
-/* The number of bytes in a long long.  */
-#undef SIZEOF_LONG_LONG
-
-/* The number of bytes in a long double.  */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The number of bytes in a double.  */
-#undef SIZEOF_DOUBLE
-
-/* The number of bytes in a float.  */
-#undef SIZEOF_FLOAT
-
-/* The number of bytes in a char *.  */
-#undef SIZEOF_CHAR_P
-
-/* The chosen CCTK precision */
-
-/* Floating point precision */
-#undef CCTK_REAL_PRECISION_16
-#undef CCTK_REAL_PRECISION_8
-#undef CCTK_REAL_PRECISION_4
-
-/* Integer precision */
-#undef CCTK_INTEGER_PRECISION_8
-#undef CCTK_INTEGER_PRECISION_4
-#undef CCTK_INTEGER_PRECISION_2
-#undef CCTK_INTEGER_PRECISION_1
-
 /* Modifier for Fortran function definitions. */
-
 #undef CCTK_FCALL
 
 /* What debugging options to use */
-
 #undef CCTK_DEBUG
 #undef CCTK_TRACEMEMORY
 
 /* Various library functions */
-
 #undef HAVE_GETHOSTBYNAME
 #undef HAVE_GETOPT_LONG_ONLY
 #undef HAVE_CRYPT
@@ -66,17 +24,19 @@
 #undef HAVE_MKSTEMP
 
 /* Do we have mode_t ? */
-
 #undef HAVE_MODE_T
 
-/* Do we have socklen_t ? */
-
-#undef HAVE_SOCKLEN_T
-
 /* Do we have SOCKET ? */
-
 #undef HAVE_SOCKET_TYPE
 
+/* Do we have socklen_t ? Default to 'int' if not. */
+#undef HAVE_SOCKLEN_T
+#ifdef HAVE_SOCKLEN_T
+#define CCTK_SOCKLEN_T socklen_t
+#else
+#define CCTK_SOCKLEN_T int
+#endif
+
 /* Some include things */
 #undef HAVE_TIME_H
 #undef HAVE_SYS_FILIO_H
@@ -101,40 +61,52 @@
 #undef TIME_WITH_SYS_TIME
 
 /* Which format does the C++ STL on this machine provide. */
-
 #undef HAVE_VECTOR
 #undef HAVE_VECTOR_H
 
 /* Timing stuff */
-
 #undef HAVE_TIME_GETTIMEOFDAY
 #undef GETTIMEOFDAY_NEEDS_TIMEZONE
 #undef HAVE_TIME_GETRUSAGE
 #undef HAVE_TIME__FTIME
 
 /* Cache stuff */
-
 #undef CCTK_CACHELINE_BYTES
 #undef CCTK_CACHE_SIZE
 
-/* DEPRECATED IN b13 */
-#undef CCTK_L2_CACHELINE_BYTES
-#undef CCTK_L2_CACHE_SIZE
-
 /* The name of the NULL device for redirecting things to */
-
 #undef NULL_DEVICE
 
-/* The TYPE of socklen_t if it does not exist */
-
-#ifdef HAVE_SOCKLEN_T
-#define CCTK_SOCKLEN_T socklen_t
-#else
-#define CCTK_SOCKLEN_T int
-#endif
+/* Define the machine architecture for the build */
+#undef CCTK_BUILD_OS
+#undef CCTK_BUILD_CPU
+#undef CCTK_BUILD_VENDOR
 
 /******************************************************************************/
 
+/* Size info for various datatypes */
+#undef SIZEOF_SHORT_INT
+#undef SIZEOF_INT
+#undef SIZEOF_LONG_INT
+#undef SIZEOF_LONG_LONG
+#undef SIZEOF_LONG_DOUBLE
+#undef SIZEOF_DOUBLE
+#undef SIZEOF_FLOAT
+#undef SIZEOF_CHAR_P
+
+/* The chosen CCTK precision */
+
+/* Floating point precision */
+#undef CCTK_REAL_PRECISION_16
+#undef CCTK_REAL_PRECISION_8
+#undef CCTK_REAL_PRECISION_4
+
+/* Integer precision */
+#undef CCTK_INTEGER_PRECISION_8
+#undef CCTK_INTEGER_PRECISION_4
+#undef CCTK_INTEGER_PRECISION_2
+#undef CCTK_INTEGER_PRECISION_1
+
 /* Integer sizes */
 #undef CCTK_HAVE_INT8
 #undef CCTK_HAVE_INT4
@@ -150,50 +122,30 @@
 
 #ifdef CCODE
 
-/* Integer sizes */
-
-/* Define the type of an 8 byte integer */
+/* CCTK C/C++ Integer datatypes */
 #undef CCTK_INT8
-
-/* Define the type of a 4 byte integer */
 #undef CCTK_INT4
-
-/* Define the type of a 2 byte integer */
 #undef CCTK_INT2
-
-/* Define the type of a 1 byte integer */
 #undef CCTK_INT1
 
-/* Float sizes */
-
-/* Define the type of a 16 byte float */
+/* CCTK C/C++ Float datatypes */
 #undef CCTK_REAL16
-
-/* Define the type of an 8 byte float */
 #undef CCTK_REAL8
-
-/* Define the type of a 4 byte float */
 #undef CCTK_REAL4
 
-/* Define the machine architecture for the build */
-#undef CCTK_BUILD_OS
-#undef CCTK_BUILD_CPU
-#undef CCTK_BUILD_VENDOR
-
 /****************************************************************************/
 /* C specific stuff */
 /****************************************************************************/
 #ifndef __cplusplus
 
-/* Define as __inline if that's what the C compiler calls it.  */
+/* Define to empty if the 'inline' keyword does not work. */
 #undef inline
 
-/* Define to empty if the keyword does not work.  */
+/* Define to empty if the 'const' keyword does not work. */
 #undef const
 
+/* Define to empty if the 'restrict' keyword does not work. */
 #undef CCTK_C_RESTRICT
-
-/* Define to empty if the keyword does not work.  */
 #ifdef CCTK_C_RESTRICT
 #define restrict CCTK_C_RESTRICT
 #endif
@@ -206,7 +158,7 @@
 #ifndef CCTK_HAVE_C_BOOL
 typedef enum {false, true} bool;
 #endif /* CCTK_HAVE_CXX_BOOL */
-#endif /* 0 */
+#endif
 
 #endif /* ! defined __cplusplus */
 /****************************************************************************/
@@ -221,7 +173,7 @@ typedef enum {false, true} bool;
 
 #ifndef CCTK_HAVE_CXX_BOOL
 typedef enum {false, true} bool;
-#endif /* CCTK_HAVE_CXX_BOOL */
+#endif
 
 /* Some C++ compilers recognise the restrict keyword */
 #undef CCTK_CXX_RESTRICT
@@ -232,16 +184,16 @@ typedef enum {false, true} bool;
 #ifdef CCTK_CXX_RESTRICT
 #define restrict CCTK_CXX_RESTRICT
 #endif
-#endif /* 0 */
+#endif
 
 #endif /* __cplusplus */
 /****************************************************************************/
 
-#endif /*CCODE */
+#endif /* CCODE */
 
 #ifdef FCODE
 
-#endif /*FCODE */
+#endif /* FCODE */
 
 /* Now include the code to pick an appropriate precison for reals and ints */
 #include "cctk_Types.h"