src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object-private.hh

*** 31,52 ****
  
  #ifndef HB_OBJECT_PRIVATE_HH
  #define HB_OBJECT_PRIVATE_HH
  
  #include "hb-private.hh"
  
  #include "hb-atomic-private.hh"
  #include "hb-mutex-private.hh"
  
  
- /* Debug */
- 
- #ifndef HB_DEBUG_OBJECT
- #define HB_DEBUG_OBJECT (HB_DEBUG+0)
- #endif
- 
- 
  /* reference_count */
  
  #define HB_REFERENCE_COUNT_INERT_VALUE -1
  #define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD
  #define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)}
--- 31,46 ----
  
  #ifndef HB_OBJECT_PRIVATE_HH
  #define HB_OBJECT_PRIVATE_HH
  
  #include "hb-private.hh"
+ #include "hb-debug.hh"
  
  #include "hb-atomic-private.hh"
  #include "hb-mutex-private.hh"
  
  
  /* reference_count */
  
  #define HB_REFERENCE_COUNT_INERT_VALUE -1
  #define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD
  #define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)}
*** 191,201 ****
  template <typename Type>
  static inline void *hb_object_get_user_data (Type               *obj,
                                               hb_user_data_key_t *key)
  {
    if (unlikely (!obj || hb_object_is_inert (obj)))
!     return NULL;
    assert (hb_object_is_valid (obj));
    return obj->header.user_data.get (key);
  }
  
  
--- 185,195 ----
  template <typename Type>
  static inline void *hb_object_get_user_data (Type               *obj,
                                               hb_user_data_key_t *key)
  {
    if (unlikely (!obj || hb_object_is_inert (obj)))
!     return nullptr;
    assert (hb_object_is_valid (obj));
    return obj->header.user_data.get (key);
  }