Revert of Update OTS to revision 6d2e08b

third_party/ots/test/ot-sanitise.cc

Index: third_party/ots/test/ot-sanitise.cc
diff --git a/third_party/ots/test/ot-sanitise.cc b/third_party/ots/test/ot-sanitise.cc
index 3204ce48328995943df57a28e353fb8bd0fd570a..2d4526a1b4d79bdec9179126a3f7cd3dcfe87a22 100644
--- a/third_party/ots/test/ot-sanitise.cc
+++ b/third_party/ots/test/ot-sanitise.cc
@@ -49,18 +49,18 @@
   }
 
   virtual ots::TableAction GetTableAction(uint32_t tag) {
+#define TAG(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d))
     switch (tag) {
-      case OTS_TAG('S','i','l','f'):
-      case OTS_TAG('S','i','l','l'):
-      case OTS_TAG('G','l','o','c'):
-      case OTS_TAG('G','l','a','t'):
-      case OTS_TAG('F','e','a','t'):
-      case OTS_TAG('C','B','D','T'):
-      case OTS_TAG('C','B','L','C'):
+      case TAG('S','i','l','f'):
+      case TAG('S','i','l','l'):
+      case TAG('G','l','o','c'):
+      case TAG('G','l','a','t'):
+      case TAG('F','e','a','t'):
         return ots::TABLE_ACTION_PASSTHRU;
       default:
         return ots::TABLE_ACTION_DEFAULT;
     }
+#undef TAG
   }
 };