From 05057d924548908600f754c3daed8875487da6d5 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 16 Feb 2004 12:28:36 +0000 Subject: [PATCH] patch for s390 from fedora test 2 rpms Original commit message from CVS: patch for s390 from fedora test 2 rpms --- ChangeLog | 4 ++++ common | 2 +- gst/gstatomic_impl.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab7fb40b8a..2492ccf943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-02-16 Thomas Vander Stichele + + * gst/gstatomic_impl.h: Fedora 2 test package patch for S390 + 2004-02-15 Julien MOUTTE * gst/gstbin.c: (gst_bin_change_state), (gst_bin_iterate): Fix a big diff --git a/common b/common index 19cb5127af..d821172609 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 19cb5127af898da4a72109547e9c31c4e14cc964 +Subproject commit d821172609916bc61bbbca7f8d2e6cf0ca1ab47a diff --git a/gst/gstatomic_impl.h b/gst/gstatomic_impl.h index 8edb921546..8228d7bd26 100644 --- a/gst/gstatomic_impl.h +++ b/gst/gstatomic_impl.h @@ -383,6 +383,7 @@ gst_atomic_int_dec_and_test (GstAtomicInt *aint) /***** S/390 *****/ #elif defined(HAVE_CPU_S390) && defined(__GNUC__) +typedef struct { volatile int counter; } atomic_t __attribute__ ((aligned (4))); GST_INLINE_FUNC void gst_atomic_int_init (GstAtomicInt *aint, gint val) { aint->counter = val; } GST_INLINE_FUNC void gst_atomic_int_destroy (GstAtomicInt *aint) { }