walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor

This commit is contained in:
Behdad Esfahbod 2011-09-16 12:30:50 -04:00
parent 55aeb04904
commit d5476a30a1
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-object-private.hh
View File

@ -54,9 +54,13 @@
#include <glib.h> #include <glib.h>
typedef volatile int hb_atomic_int_t; typedef volatile int hb_atomic_int_t;
#define hb_atomic_int_fetch_and_add(AI, V) g_atomic_int_exchange_and_add (&(AI), V) #if GLIB_CHECK_VERSION(2,29,5)
#define hb_atomic_int_get(AI) g_atomic_int_get (&(AI)) #define hb_atomic_int_add(AI, V) g_atomic_int_add (&(AI), V)
#define hb_atomic_int_set(AI, V) g_atomic_int_set (&(AI), V) #else
#define hb_atomic_int_add(AI, V) g_atomic_int_exchange_and_add (&(AI), V)
#endif
#define hb_atomic_int_get(AI) g_atomic_int_get (&(AI))
#define hb_atomic_int_set(AI, V) g_atomic_int_set (&(AI), V)
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
@ -64,9 +68,9 @@ typedef volatile int hb_atomic_int_t;
#include <intrin.h> #include <intrin.h>
typedef long hb_atomic_int_t; typedef long hb_atomic_int_t;
#define hb_atomic_int_fetch_and_add(AI, V) _InterlockedExchangeAdd (&(AI), V) #define hb_atomic_int_add(AI, V) _InterlockedExchangeAdd (&(AI), V)
#define hb_atomic_int_get(AI) (_ReadBarrier (), (AI)) #define hb_atomic_int_get(AI) (_ReadBarrier (), (AI))
#define hb_atomic_int_set(AI, V) ((void) _InterlockedExchange (&(AI), (V))) #define hb_atomic_int_set(AI, V) ((void) _InterlockedExchange (&(AI), (V)))
#else #else
@ -74,9 +78,9 @@ typedef long hb_atomic_int_t;
#warning "Could not find any system to define atomic_int macros, library will NOT be thread-safe" #warning "Could not find any system to define atomic_int macros, library will NOT be thread-safe"
typedef volatile int hb_atomic_int_t; typedef volatile int hb_atomic_int_t;
#define hb_atomic_int_fetch_and_add(AI, V) ((AI) += (V), (AI) - (V)) #define hb_atomic_int_add(AI, V) ((AI) += (V), (AI) - (V))
#define hb_atomic_int_get(AI) (AI) #define hb_atomic_int_get(AI) (AI)
#define hb_atomic_int_set(AI, V) ((void) ((AI) = (V))) #define hb_atomic_int_set(AI, V) ((void) ((AI) = (V)))
#endif #endif
@ -93,8 +97,8 @@ typedef struct {
#define HB_REFERENCE_COUNT_INVALID {HB_REFERENCE_COUNT_INVALID_VALUE} #define HB_REFERENCE_COUNT_INVALID {HB_REFERENCE_COUNT_INVALID_VALUE}
inline void init (int v) { ref_count = v; /* non-atomic is fine */ } inline void init (int v) { ref_count = v; /* non-atomic is fine */ }
inline int inc (void) { return hb_atomic_int_fetch_and_add (ref_count, 1); } inline int inc (void) { return hb_atomic_int_add (ref_count, 1); }
inline int dec (void) { return hb_atomic_int_fetch_and_add (ref_count, -1); } inline int dec (void) { return hb_atomic_int_add (ref_count, -1); }
inline void set (int v) { hb_atomic_int_set (ref_count, v); } inline void set (int v) { hb_atomic_int_set (ref_count, v); }
inline int get (void) const { return hb_atomic_int_get (ref_count); } inline int get (void) const { return hb_atomic_int_get (ref_count); }