diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/glib/patches/patch-glib_gatomic_c | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'package/glib/patches/patch-glib_gatomic_c')
| -rw-r--r-- | package/glib/patches/patch-glib_gatomic_c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/package/glib/patches/patch-glib_gatomic_c b/package/glib/patches/patch-glib_gatomic_c new file mode 100644 index 000000000..42d41196b --- /dev/null +++ b/package/glib/patches/patch-glib_gatomic_c @@ -0,0 +1,10 @@ +--- glib-2.27.5.orig/glib/gatomic.c 2010-09-05 06:20:56.000000000 +0200 ++++ glib-2.27.5/glib/gatomic.c 2011-02-18 20:52:37.703561782 +0100 +@@ -882,6 +882,7 @@ g_atomic_pointer_compare_and_exchange (v + + #ifdef DEFINE_WITH_MUTEXES + /* We have to use the slow, but safe locking method */ ++#include "gthread.h" + static GMutex *g_atomic_mutex; + + /** |