//\r
// Scalable macro to set the most significant bit in a natural number\r
//\r
-#define MAX_BIT 0x8000000000000000ULL \r
-#define MAX_2_BITS 0xC000000000000000ULL\r
-\r
+#define MAX_BIT (1ULL << (sizeof (INTN) * 8 - 1)) \r
+#define MAX_2_BITS (3ULL << (sizeof (INTN) * 8 - 2))\r
\r
//\r
// Maximum legal EBC address\r
//\r
-#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFULL\r
-\r
+#define MAX_ADDRESS ((UINTN) ~0)\r
//\r
// Modifier to ensure that all protocol member functions and EFI intrinsics\r
// use the correct C calling convention. All protocol member functions and\r