annotate src/mingw-glib-2-fixes.patch @ 4043:b54e00ea56bc

of-fl-core: readd fl-core patch in dos mode * src/of-fl-core-1-fixes.patch: readd patch
author John Donoghue
date Fri, 02 Oct 2015 10:24:38 -0400
parents 96e96221fe09
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3183
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 --- a/glib/gatomic.c.orig 2013-07-29 12:05:27 -0400
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 +++ a/glib/gatomic.c 2013-07-29 12:07:46 -0400
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 @@ -475,6 +475,14 @@
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 #if !defined (_MSC_VER) || _MSC_VER <= 1200
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 #include "gmessages.h"
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 +
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 +#ifndef MemoryBarrier
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 +static inline void MemoryBarrier (void) {
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 + long dummy = 0;
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 + InterlockedExchange (&dummy, 1);
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +}
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 +#endif
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 +
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 /* Inlined versions for older compiler */
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 static LONG
96e96221fe09 Update glib mingw native and cross compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 _gInterlockedAnd (volatile guint *atomic,