[tor-commits] [tor-messenger-build/master] Add patch for bug 1176731; MinGW cross-compilation error

[sukhbir at torproject.org]

commit 161f6110a0862d34a1ec9498878ef40137cc9347
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sun Oct 11 13:32:29 2015 -0400

    Add patch for bug 1176731; MinGW cross-compilation error
---
 ...31-do-not-mark-static-inline-functions.mozpatch |   29 ++++++++++++++++++++
 projects/instantbird/config                        |    2 ++
 2 files changed, 31 insertions(+)

diff --git a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch
new file mode 100644
index 0000000..7580ea0
--- /dev/null
+++ b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch
@@ -0,0 +1,29 @@
+From: Jacek Caban <jacek at codeweavers.com>
+Don't maek static inline functions as MFBT_API in TimeStamp.h.
+
+
+diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
+index 8f043d4..c2c9cf9 100644
+--- a/mozglue/misc/TimeStamp.h
++++ b/mozglue/misc/TimeStamp.h
+@@ -421,18 +421,18 @@ public:
+    * Now() is trying to ensure the best possible precision on each platform,
+    * at least one millisecond.
+    *
+    * NowLoRes() has been introduced to workaround performance problems of
+    * QueryPerformanceCounter on the Windows platform.  NowLoRes() is giving
+    * lower precision, usually 15.6 ms, but with very good performance benefit.
+    * Use it for measurements of longer times, like >200ms timeouts.
+    */
+-  static MFBT_API TimeStamp Now() { return Now(true); }
+-  static MFBT_API TimeStamp NowLoRes() { return Now(false); }
++  static TimeStamp Now() { return Now(true); }
++  static TimeStamp NowLoRes() { return Now(false); }
+ 
+   /**
+    * Return a timestamp representing the time when the current process was
+    * created which will be comparable with other timestamps taken with this
+    * class. If the actual process creation time is detected to be inconsistent
+    * the @a aIsInconsistent parameter will be set to true, the returned
+    * timestamp however will still be valid though inaccurate.
+    *
diff --git a/projects/instantbird/config b/projects/instantbird/config
index a385bd0..8838c70 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -112,6 +112,8 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: fix-mingw-build.patch
     enable: '[% c("var/windows") %]'
+  - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch
     enable: '[% c("var/windows") %]'
   - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch