Remove SANITIZE_BASE2

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index bc7e7be..9713da0 100644 (file)
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -234,7 +234,6 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
 #define SANITIZE_THIS3(X,Y,Z) (SANITIZE_THIS (X) && SANITIZE_THIS (Y) && SANITIZE_THIS(Z))
 
 #define SANITIZE_BASE(X,B) likely ((X).sanitize (SANITIZE_ARG, B))
-#define SANITIZE_BASE2(X,Y,B) (SANITIZE_BASE (X,B) && SANITIZE_BASE (Y,B))
 
 #define SANITIZE_SELF() SANITIZE_OBJ (*this)
 #define SANITIZE_OBJ(X) SANITIZE_MEM(&(X), sizeof (X))

diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index a2c5a1a..5736a5f 100644 (file)
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -779,7 +779,8 @@ struct EntryExitRecord
 
   inline bool sanitize (SANITIZE_ARG_DEF, void *base) {
     TRACE_SANITIZE ();
-    return SANITIZE_BASE2 (entryAnchor, exitAnchor, base);
+    return SANITIZE_BASE (entryAnchor, base)
+       && SANITIZE_BASE (exitAnchor, base);
   }
 
   OffsetTo<Anchor>