Revert "Make GCC happy again." and "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

src/serialize.h

Index: src/serialize.h
diff --git a/src/serialize.h b/src/serialize.h
index 9aaf38182db6ea28383fbfd8cb1ff72897d262f7..cc267aa5fa21ea9fa1cf9a54a3b2aea586ffac49 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -275,7 +275,7 @@ class BackReferenceMap : public AddressMapBase {
 
   void Add(HeapObject* obj, BackReference b) {
     DCHECK(b.is_valid());
-    DCHECK_NULL(LookupEntry(map_, obj, false));
+    DCHECK_EQ(NULL, LookupEntry(map_, obj, false));
     HashMap::Entry* entry = LookupEntry(map_, obj, true);
     SetValue(entry, b.bitfield());
   }
@@ -307,7 +307,7 @@ class HotObjectsList {
   }
 
   HeapObject* Get(int index) {
-    DCHECK_NOT_NULL(circular_queue_[index]);
+    DCHECK_NE(NULL, circular_queue_[index]);
     return circular_queue_[index];
   }