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

*** 27,40 ****
   *      Chris Wilson <chris@chris-wilson.co.uk>
   * Red Hat Author(s): Behdad Esfahbod
   * Google Author(s): Behdad Esfahbod
   */
  
! #ifndef HB_MUTEX_PRIVATE_HH
! #define HB_MUTEX_PRIVATE_HH
  
! #include "hb-private.hh"
  
  
  /* mutex */
  
  /* We need external help for these */
--- 27,40 ----
   *      Chris Wilson <chris@chris-wilson.co.uk>
   * Red Hat Author(s): Behdad Esfahbod
   * Google Author(s): Behdad Esfahbod
   */
  
! #ifndef HB_MUTEX_HH
! #define HB_MUTEX_HH
  
! #include "hb.hh"
  
  
  /* mutex */
  
  /* We need external help for these */
*** 46,56 ****
   && defined(hb_mutex_impl_finish)
  
  /* Defined externally, i.e. in config.h; must have typedef'ed hb_mutex_impl_t as well. */
  
  
! #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
  
  #include <windows.h>
  typedef CRITICAL_SECTION hb_mutex_impl_t;
  #define HB_MUTEX_IMPL_INIT      {0}
  #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
--- 46,56 ----
   && defined(hb_mutex_impl_finish)
  
  /* Defined externally, i.e. in config.h; must have typedef'ed hb_mutex_impl_t as well. */
  
  
! #elif !defined(HB_NO_MT) && defined(_WIN32)
  
  #include <windows.h>
  typedef CRITICAL_SECTION hb_mutex_impl_t;
  #define HB_MUTEX_IMPL_INIT      {0}
  #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
*** 129,141 ****
  {
    /* TODO Add tracing. */
  
    hb_mutex_impl_t m;
  
!   inline void init   (void) { hb_mutex_impl_init   (&m); }
!   inline void lock   (void) { hb_mutex_impl_lock   (&m); }
!   inline void unlock (void) { hb_mutex_impl_unlock (&m); }
!   inline void fini (void) { hb_mutex_impl_finish (&m); }
  };
  
  
! #endif /* HB_MUTEX_PRIVATE_HH */
--- 129,149 ----
  {
    /* TODO Add tracing. */
  
    hb_mutex_impl_t m;
  
!   void init   () { hb_mutex_impl_init   (&m); }
!   void lock   () { hb_mutex_impl_lock   (&m); }
!   void unlock () { hb_mutex_impl_unlock (&m); }
!   void fini ()   { hb_mutex_impl_finish (&m); }
! };
! 
! struct hb_lock_t
! {
!   hb_lock_t (hb_mutex_t &mutex_) : mutex (mutex_) { mutex.lock (); }
!   ~hb_lock_t () { mutex.unlock (); }
!   private:
!   hb_mutex_t &mutex;
  };
  
  
! #endif /* HB_MUTEX_HH */