[config] Rename HB_NO_VARIATIONS2 to HB_NO_AVAR2

pull/3862/head
Behdad Esfahbod 2 years ago
parent 60c6b7786d
commit a0f999cd95
  1. 2
      src/hb-config.hh
  2. 6
      src/hb-ot-var-avar-table.hh

@ -104,7 +104,7 @@
#ifdef HB_NO_BORING_EXPANSION #ifdef HB_NO_BORING_EXPANSION
#define HB_NO_BEYOND_64K #define HB_NO_BEYOND_64K
#define HB_NO_VARIATIONS2 #define HB_NO_AVAR2
#endif #endif
#ifdef HB_DISABLE_DEPRECATED #ifdef HB_DISABLE_DEPRECATED

@ -143,7 +143,7 @@ struct avar
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (!(version.sanitize (c) && if (!(version.sanitize (c) &&
(version.major == 1 (version.major == 1
#ifndef HB_NO_VARIATIONS2 #ifndef HB_NO_AVAR2
|| version.major == 2 || version.major == 2
#endif #endif
) && ) &&
@ -159,7 +159,7 @@ struct avar
map = &StructAfter<SegmentMaps> (*map); map = &StructAfter<SegmentMaps> (*map);
} }
#ifndef HB_NO_VARIATIONS2 #ifndef HB_NO_AVAR2
if (version.major < 2) if (version.major < 2)
return_trace (true); return_trace (true);
@ -182,7 +182,7 @@ struct avar
map = &StructAfter<SegmentMaps> (*map); map = &StructAfter<SegmentMaps> (*map);
} }
#ifndef HB_NO_VARIATIONS2 #ifndef HB_NO_AVAR2
if (version.major < 2) if (version.major < 2)
return; return;

Loading…
Cancel
Save