From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 4 May 2010 18:40:55 +0000 (-0400)
Subject: Remove SANITIZE2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73c7dbf7f5433c0cdd467ef32402f52867e9798e;p=platform%2Fupstream%2FlibHarfBuzzSharp.git

Remove SANITIZE2
---

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 48455ec..bc7e7be 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -228,7 +228,6 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
 }
 
 #define SANITIZE(X) likely ((X).sanitize (SANITIZE_ARG))
-#define SANITIZE2(X,Y) (SANITIZE (X) && SANITIZE (Y))
 
 #define SANITIZE_THIS(X) likely ((X).sanitize (SANITIZE_ARG, CharP(this)))
 #define SANITIZE_THIS2(X,Y) (SANITIZE_THIS (X) && SANITIZE_THIS (Y))
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index 889baa7..d2890b0 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -420,7 +420,7 @@ struct Ligature
   public:
   inline bool sanitize (SANITIZE_ARG_DEF) {
     TRACE_SANITIZE ();
-    return SANITIZE2 (ligGlyph, component);
+    return SANITIZE (ligGlyph) && SANITIZE (component);
   }
 
   private: