Imported Upstream version 2.6.4

[platform/upstream/harfbuzz.git] / src / hb-shape-plan.hh

diff --git a/src/hb-shape-plan.hh b/src/hb-shape-plan.hh
index 3a057fd..6da7edb 100644 (file)
--- a/src/hb-shape-plan.hh
+++ b/src/hb-shape-plan.hh
@@ -39,21 +39,23 @@ struct hb_shape_plan_key_t
   const hb_feature_t      *user_features;
   unsigned int             num_user_features;
 
+#ifndef HB_NO_OT_SHAPE
   hb_ot_shape_plan_key_t   ot;
+#endif
 
   hb_shape_func_t         *shaper_func;
   const char              *shaper_name;
 
-  HB_INTERNAL inline bool init (bool                           copy,
-                               hb_face_t                     *face,
-                               const hb_segment_properties_t *props,
-                               const hb_feature_t            *user_features,
-                               unsigned int                   num_user_features,
-                               const int                     *coords,
-                               unsigned int                   num_coords,
-                               const char * const            *shaper_list);
+  HB_INTERNAL bool init (bool                           copy,
+                        hb_face_t                     *face,
+                        const hb_segment_properties_t *props,
+                        const hb_feature_t            *user_features,
+                        unsigned int                   num_user_features,
+                        const int                     *coords,
+                        unsigned int                   num_coords,
+                        const char * const            *shaper_list);
 
-  HB_INTERNAL inline void free () { ::free ((void *) user_features); }
+  HB_INTERNAL void free () { ::free ((void *) user_features); }
 
   HB_INTERNAL bool user_features_match (const hb_shape_plan_key_t *other);
 
@@ -65,7 +67,9 @@ struct hb_shape_plan_t
   hb_object_header_t header;
   hb_face_t *face_unsafe; /* We don't carry a reference to face. */
   hb_shape_plan_key_t key;
+#ifndef HB_NO_OT_SHAPE
   hb_ot_shape_plan_t ot;
+#endif
 };