--- numeric_vocab.hh	2007-06-10 08:24:27.000000000 +0200
+++ numeric_vocab.hh-adjusted	2007-06-10 08:19:59.000000000 +0200
@@ -22,7 +22,7 @@
 typedef uint64_t u64;
 
 BOOST_STATIC_ASSERT(sizeof(char) == 1);
-BOOST_STATIC_ASSERT(CHAR_BIT == 8);
+BOOST_STATIC_ASSERT(__CHAR_BIT__ == 8);
 BOOST_STATIC_ASSERT(sizeof(u8) == 1);
 BOOST_STATIC_ASSERT(sizeof(u16) == 2);
 BOOST_STATIC_ASSERT(sizeof(u32) == 4);
--- constants.cc	2007-06-10 08:24:15.000000000 +0200
+++ constants.cc-adjusted	2007-06-10 08:20:10.000000000 +0200
@@ -137,7 +137,7 @@
   size_t const merkle_bitmap_length_in_bytes = merkle_bitmap_length_in_bits / 8;
 
   BOOST_STATIC_ASSERT(sizeof(char) == 1);
-  BOOST_STATIC_ASSERT(CHAR_BIT == 8);
+  BOOST_STATIC_ASSERT(__CHAR_BIT__ == 8);
   BOOST_STATIC_ASSERT(merkle_num_tree_levels > 0);
   BOOST_STATIC_ASSERT(merkle_num_tree_levels < 256);
   BOOST_STATIC_ASSERT(merkle_fanout_bits > 0);