diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
| commit | 7cb9b7ab9db548eca8a67883b010dd14d2efd07e (patch) | |
| tree | 9bb89dfc5492ca7945541013bc9992485a775f72 /gst-libs | |
| parent | ba2ec3ff984262eceb6fdeeed08cefcaee045b15 (diff) | |
| download | gstreamer-plugins-good-7cb9b7ab9db548eca8a67883b010dd14d2efd07e.tar.gz | |
Use new GLib API unconditionally
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/glib-compat-private.h | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/gst-libs/gst/glib-compat-private.h b/gst-libs/gst/glib-compat-private.h index b9248e686..91fe1ff7f 100644 --- a/gst-libs/gst/glib-compat-private.h +++ b/gst-libs/gst/glib-compat-private.h @@ -27,43 +27,13 @@ G_BEGIN_DECLS -#if !GLIB_CHECK_VERSION(2,25,0) - -#if defined (_MSC_VER) && !defined(_WIN64) -typedef struct _stat32 GStatBuf; -#else -typedef struct stat GStatBuf; -#endif - -#endif - #if GLIB_CHECK_VERSION(2,26,0) #define GLIB_HAS_GDATETIME #endif -/* See bug #651514 */ -#if GLIB_CHECK_VERSION(2,29,5) -#define G_ATOMIC_POINTER_COMPARE_AND_EXCHANGE(a,b,c) \ - g_atomic_pointer_compare_and_exchange ((a),(b),(c)) -#define G_ATOMIC_INT_COMPARE_AND_EXCHANGE(a,b,c) \ - g_atomic_int_compare_and_exchange ((a),(b),(c)) -#else -#define G_ATOMIC_POINTER_COMPARE_AND_EXCHANGE(a,b,c) \ - g_atomic_pointer_compare_and_exchange ((volatile gpointer *)(a),(b),(c)) -#define G_ATOMIC_INT_COMPARE_AND_EXCHANGE(a,b,c) \ - g_atomic_int_compare_and_exchange ((volatile int *)(a),(b),(c)) -#endif - -/* See bug #651514 */ -#if GLIB_CHECK_VERSION(2,29,5) -#define G_ATOMIC_INT_ADD(a,b) g_atomic_int_add ((a),(b)) -#else -#define G_ATOMIC_INT_ADD(a,b) g_atomic_int_exchange_and_add ((a),(b)) -#endif - /* copies */ -#if GLIB_CHECK_VERSION (2, 31, 0) +#if 0 //GLIB_CHECK_VERSION (2, 31, 0) #define g_mutex_new gst_g_mutex_new static inline GMutex * gst_g_mutex_new (void) |