harfbuzz-ng roll

third_party/harfbuzz-ng/src/hb-mutex-private.hh

 /*
  * Copyright © 2007  Chris Wilson
  * Copyright © 2009,2010  Red Hat, Inc.
  * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
@@ skipping 26 matching lines @@
 
 /* mutex */
 
 /* We need external help for these */
 
 #if 0
 
 
 #elif !defined(HB_NO_MT) && defined(_MSC_VER) || defined(__MINGW32__)
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 typedef CRITICAL_SECTION hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT      { NULL, 0, 0, NULL, NULL, 0 }
 #define hb_mutex_impl_init(M)   InitializeCriticalSection (M)
 #define hb_mutex_impl_lock(M)   EnterCriticalSection (M)
 #define hb_mutex_impl_unlock(M) LeaveCriticalSection (M)
 #define hb_mutex_impl_finish(M) DeleteCriticalSection (M)
 
 
 #elif !defined(HB_NO_MT) && (defined(HAVE_PTHREAD) || defined(__APPLE__))
 
 #include <pthread.h>
 typedef pthread_mutex_t hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT      PTHREAD_MUTEX_INITIALIZER
 #define hb_mutex_impl_init(M)   pthread_mutex_init (M, NULL)
 #define hb_mutex_impl_lock(M)   pthread_mutex_lock (M)
 #define hb_mutex_impl_unlock(M) pthread_mutex_unlock (M)
 #define hb_mutex_impl_finish(M) pthread_mutex_destroy (M)
 
 
 #elif !defined(HB_NO_MT) && defined(HAVE_GLIB)
 
 #include <glib.h>
+#if !GLIB_CHECK_VERSION(2,32,0)
 typedef GStaticMutex hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT      G_STATIC_MUTEX_INIT
 #define hb_mutex_impl_init(M)   g_static_mutex_init (M)
 #define hb_mutex_impl_lock(M)   g_static_mutex_lock (M)
 #define hb_mutex_impl_unlock(M) g_static_mutex_unlock (M)
 #define hb_mutex_impl_finish(M) g_static_mutex_free (M)
+#else
+typedef GMutex hb_mutex_impl_t;
+#define HB_MUTEX_IMPL_INIT      {0}
+#define hb_mutex_impl_init(M)   g_mutex_init (M)
+#define hb_mutex_impl_lock(M)   g_mutex_lock (M)
+#define hb_mutex_impl_unlock(M) g_mutex_unlock (M)
+#define hb_mutex_impl_finish(M) g_mutex_clear (M)
+#endif
 
 
 #elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
 
 #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD)
 # include <sched.h>
 # define HB_SCHED_YIELD() sched_yield ()
 #else
 # define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END
 #endif
@@ skipping 45 matching lines @@
   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 finish (void) { hb_mutex_impl_finish (&m); }
 };
 
 
 #endif /* HB_MUTEX_PRIVATE_HH */