Fix use of BIT64 in MatchBox

amgprec/amg_config.h.in

@@ -11,6 +11,7 @@
 @CHAVEMUMPS@
 @CHAVEMUMPSMODULES@
 @CHAVEMUMPSINCLUDES@
+@CXXMATCHBOXBIT@
 
 
 #endif

amgprec/impl/aggregator/MatchBoxPC.h

@@ -117,7 +117,7 @@ extern "C"
 // Regular long integer:
 #ifndef LONG_INT_H
 #define LONG_INT_H
-#ifdef BIT64
+#ifdef AMG_MATCHBOXP_BIT64
     typedef int64_t MilanLongInt;
     typedef MPI_LONG MilanMpiLongInt;
 #else
@@ -163,7 +163,7 @@ extern "C"
 #define MilanIntMax INT32_MAX
 #define MilanIntMin INT32_MIN
 
-#ifdef BIT64
+#ifdef AMG_MATCHBOXP_BIT64
 #define MilanLongIntMax INT64_MAX
 #define MilanLongIntMin -INT64_MAX
 #else

amgprec/impl/aggregator/primitiveDataTypeDefinitions.h

@@ -49,8 +49,8 @@
 using namespace std;
 
 //Comment out these if you do not need 64 bits.
-//#ifndef BIT64
-//	#define BIT64
+//#ifndef AMG_MATCHBOXP_BIT64
+//	#define AMG_MATCHBOXP_BIT64
 //#endif
 
 //Regular integer:
@@ -63,7 +63,7 @@ using namespace std;
 //Regular long Integer:
 #ifndef LONG_INT_H
 #define LONG_INT_H
-	#ifdef BIT64
+	#ifdef AMG_MATCHBOXP_BIT64
 	typedef int64_t MilanLongInt;
 //	typedef MPI_LONG MilanMpiLongInt;
 	#else
@@ -108,7 +108,7 @@ using namespace std;
 #define MilanIntMax INT_MAX
 #define MilanIntMin INT_MIN
 
-#ifdef BIT64
+#ifdef AMG_MATCHBOXP_BIT64
 	#define MilanLongIntMax LONG_MAX
 	#define MilanLongIntMin -LONG_MAX
 #else