[gtk-builder-win] fontconfig: fix fcatomic
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-builder-win] fontconfig: fix fcatomic
- Date: Fri, 11 Jul 2014 11:46:06 +0000 (UTC)
commit 1cc8fe5887325713bc7c50caf7a07f6e0ccea21a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Fri Jul 11 13:45:42 2014 +0200
fontconfig: fix fcatomic
win32/libs/33_libfontconfig.bat | 3 +++
win32/libs/33_libfontconfig/fcatomic.patch | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/win32/libs/33_libfontconfig.bat b/win32/libs/33_libfontconfig.bat
index 9339ad5..72c35eb 100644
--- a/win32/libs/33_libfontconfig.bat
+++ b/win32/libs/33_libfontconfig.bat
@@ -7,6 +7,9 @@ gzip -d -f -c fontconfig-$MODVER.tar.gz > fontconfig-$MODVER.tar
tar -xf fontconfig-$MODVER.tar
cd fontconfig-$MODVER
+cd ..
+patch -p0 < fcatomic.patch
+cd fontconfig-$MODVER
echo To fix ftheader.h location detection by make...
diff --git a/win32/libs/33_libfontconfig/fcatomic.patch b/win32/libs/33_libfontconfig/fcatomic.patch
new file mode 100644
index 0000000..8d26763
--- /dev/null
+++ b/win32/libs/33_libfontconfig/fcatomic.patch
@@ -0,0 +1,17 @@
+--- fontconfig-2.11.1/src/fcatomic.h 2014-01-20 09:14:20.000000000 +0100
++++ fontconfig-2.11.1/src/fcatomic.h 2014-07-11 13:41:39.311504300 +0200
+@@ -51,14 +51,10 @@
+ /* mingw32 does not have MemoryBarrier.
+ * MemoryBarrier may be defined as a macro or a function.
+ * Just make a failsafe version for ourselves. */
+-#ifdef MemoryBarrier
+-#define HBMemoryBarrier MemoryBarrier
+-#else
+ static inline void HBMemoryBarrier (void) {
+ long dummy = 0;
+ InterlockedExchange (&dummy, 1);
+ }
+-#endif
+
+ typedef LONG fc_atomic_int_t;
+ #define fc_atomic_int_add(AI, V) InterlockedExchangeAdd (&(AI), (V))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]